Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Jan 2015 21:46:04 +0000 (13:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Jan 2015 21:46:04 +0000 (13:46 -0800)
commit92ef9ce301ed98b2b963d2f3c5367904efc69fba
treeb95702ba644032a79847cce487566b7650db5664
parent1f59fe76678b49fc406c6d7b63dec4abe60a0547
parent14bf61ffe6ac54afcd1e888a4407fe16054483db
Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-fs

Pull quota and UDF fix from Jan Kara:
 "A fix for UDF to properly free preallocated blocks and a fix for quota
  so that Q_GETQUOTA quotactl reports correct numbers for XFS filesystem
  (and similarly Q_XGETQUOTA quotactl works properly for other
  filesystems)"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  quota: Switch ->get_dqblk() and ->set_dqblk() to use bytes as space units
  udf: Release preallocation on last writeable close