]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Apr 2011 17:52:51 +0000 (10:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Apr 2011 17:52:51 +0000 (10:52 -0700)
commitf28c6179e5d8793bbeaceaef15fbbedcb2745f3b
treeab6f072f71290e6a88e8f61bcb2e25f8fc323b84
parentf0e615c3cb72b42191b558c130409335812621d8
parent44ad37d69b2cc421d5b5c7ad7fed16230685b092
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