From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Aug 2014 23:32:16 +0000 (-0500)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Tag: v3.17-rc2~23
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=92075f9f640dc3fde91b833c08fbc921b1649088;p=cascardo%2Flinux.git

Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-fs

Pull filesystem fixes from Jan Kara:
 "udf, isofs, and ext3 bug fixes"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  ext3: Count internal journal as bsddf overhead in ext3_statfs
  isofs: Fix unbounded recursion when processing relocated directories
  udf: avoid unneeded up_write when fail to add entry in ->symlink
---

92075f9f640dc3fde91b833c08fbc921b1649088