diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-20 18:48:25 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-20 18:48:25 -1000 |
| commit | ca6215dfc7d09809b97f2d6af0535d7836cbb966 (patch) | |
| tree | 759804213ad64fbf81fbc3194557977b54d503e0 /drivers | |
| parent | 3587b1b097d70c2eb9fee95ea7995d13c05f66e5 (diff) | |
| parent | ae49eeec785025373e28dc24c8351c6bba688d99 (diff) | |
| download | linux-ca6215dfc7d09809b97f2d6af0535d7836cbb966.tar.bz2 | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull reiserfs and ext3 fixes from Jan Kara:
"Fixes of reiserfs deadlocks when quotas are enabled (locking there was
completely busted by BKL conversion) and also one small ext3 fix in
the trim interface."
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
ext3: Avoid underflow of in ext3_trim_fs()
reiserfs: Move quota calls out of write lock
reiserfs: Protect reiserfs_quota_write() with write lock
reiserfs: Protect reiserfs_quota_on() with write lock
reiserfs: Fix lock ordering during remount
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions