| commit | e865f4965ff636cf18c9bed52dba44899ff63594 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 04 13:18:27 2016 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 04 13:18:27 2016 -0700 |
| tree | 5a2f7b3ef069ffd3a3129871d8be0fbbd8388e78 | |
| parent | c7e82c648598b6fc8aa65b4bb99b55b6dd23faad [diff] | |
| parent | 8f9e8f5fcc059a3cba87ce837c88316797ef3645 [diff] |
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