diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-04 22:18:27 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-04 22:18:27 +0200 |
commit | e865f4965ff636cf18c9bed52dba44899ff63594 (patch) | |
tree | 5a2f7b3ef069ffd3a3129871d8be0fbbd8388e78 /fs/hfsplus/btree.c | |
parent | Merge tag 'f2fs-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/j... (diff) | |
parent | ocfs2: Fix Q_GETNEXTQUOTA for filesystem without quotas (diff) | |
download | linux-e865f4965ff636cf18c9bed52dba44899ff63594.tar.xz linux-e865f4965ff636cf18c9bed52dba44899ff63594.zip |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull quota fixes from Jan Kara:
"Fixes for oopses when the new quotactl gets used with quotas disabled"
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
ocfs2: Fix Q_GETNEXTQUOTA for filesystem without quotas
quota: Handle Q_GETNEXTQUOTA when quota is disabled
Diffstat (limited to 'fs/hfsplus/btree.c')
0 files changed, 0 insertions, 0 deletions