| commit | f28c6179e5d8793bbeaceaef15fbbedcb2745f3b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 19 10:52:51 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 19 10:52:51 2011 -0700 |
| tree | ab6f072f71290e6a88e8f61bcb2e25f8fc323b84 | |
| parent | f0e615c3cb72b42191b558c130409335812621d8 [diff] | |
| parent | 44ad37d69b2cc421d5b5c7ad7fed16230685b092 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: GFS2: filesystem hang caused by incorrect lock order GFS2: Don't try to deallocate unlinked inodes when mounted ro GFS2: directly write blocks past i_size GFS2: write_end error path fails to unlock transaction lock