Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2fa389c5eb8c97d621653184d2adf5fdbd4a3167

Authored by Christoph Hellwig
Committed by Linus Torvalds
1 parent 84de856ed3
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] quota: sanitize dentry handling in vfs_quota_on_mount 

Use lookup_one_len instead of opencoding a simplified lookup using
lookup_hash with a fake hash.

Also there's no need anymore for the d_invalidate as we have a completely
valid dentry now.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 1 additions and 8 deletions Side-by-side Diff

... ... @@ -1522,11 +1522,10 @@
1522 1522 int vfs_quota_on_mount(struct super_block *sb, char *qf_name,
1523 1523 int format_id, int type)
1524 1524 {
1525   - struct qstr name = {.name = qf_name, .len = 0, .len = strlen(qf_name)};
1526 1525 struct dentry *dentry;
1527 1526 int error;
1528 1527  
1529   - dentry = lookup_hash(&name, sb->s_root);
  1528 + dentry = lookup_one_len(qf_name, sb->s_root, strlen(qf_name));
1530 1529 if (IS_ERR(dentry))
1531 1530 return PTR_ERR(dentry);
1532 1531  
... ... @@ -1534,12 +1533,6 @@
1534 1533 if (!error)
1535 1534 error = vfs_quota_on_inode(dentry->d_inode, type, format_id);
1536 1535  
1537   - /*
1538   - * Now invalidate and put the dentry - quota got its own reference
1539   - * to inode and dentry has at least wrong hash so we had better
1540   - * throw it away.
1541   - */
1542   - d_invalidate(dentry);
1543 1536 dput(dentry);
1544 1537 return error;
1545 1538 }