diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-16 18:12:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-16 18:12:38 -0700 |
| commit | 5d5c5dca9c2db027770e44c69a73ea7f3919dcfc (patch) | |
| tree | 68a9673c5a56874f36dda62dd724e5509479d6c3 /fs/quota | |
| parent | ecb2ecd9c241de16ebb31b7dc441dbbfc0f6006e (diff) | |
| parent | 6c29c50fda25c2ac2ce45a9b042ff7e424aa8eac (diff) | |
| download | talos-obmc-linux-5d5c5dca9c2db027770e44c69a73ea7f3919dcfc.tar.gz talos-obmc-linux-5d5c5dca9c2db027770e44c69a73ea7f3919dcfc.zip | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull ext2, ext3, quota fixes from Jan Kara:
"Fix three regressions caused by user namespace conversions (ext2,
ext3, quota) and minor ext3 fix and cleanup."
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
quota: Silence warning about PRJQUOTA not being handled in need_print_warning()
ext3: fix return values on parse_options() failure
ext2: fix return values on parse_options() failure
ext3: ext3_bread usage audit
ext3: fix possible non-initialized variable on htree_dirblock_to_tree()
Diffstat (limited to 'fs/quota')
| -rw-r--r-- | fs/quota/dquot.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 557a9c20a215..05ae3c97f7a5 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -1160,6 +1160,8 @@ static int need_print_warning(struct dquot_warn *warn) return uid_eq(current_fsuid(), warn->w_dq_id.uid); case GRPQUOTA: return in_group_p(warn->w_dq_id.gid); + case PRJQUOTA: /* Never taken... Just make gcc happy */ + return 0; } return 0; } |
