]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Mar 2012 17:00:14 +0000 (10:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Mar 2012 17:00:14 +0000 (10:00 -0700)
commit9a7259d5c8978bbeb5fdcf64b168f8470d8208a6
tree5c255d4b18622de06c2637c0c4069a384e99466d
parente9c0f1529c9022afbab16a442382aa9a84a79c41
parente703c206135acb458adb705ec44bcc5d2615b37d
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Pull ext3, UDF, and quota fixes from Jan Kara:
 "A couple of ext3 & UDF fixes and also one improvement in quota
  locking."

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  ext3: fix start and len arguments handling in ext3_trim_fs()
  udf: Fix deadlock in udf_release_file()
  udf: Fix file entry logicalBlocksRecorded
  udf: Fix handling of i_blocks
  quota: Make quota code not call tty layer with dqptr_sem held
  udf: Init/maintain file entry checkpoint field
  ext3: Update ctime in ext3_splice_branch() only when needed
  ext3: Don't call dquot_free_block() if we don't update anything
  udf: Remove unnecessary OOM messages
fs/quota/dquot.c
fs/udf/super.c