diff --git a/[refs] b/[refs] index 4ca19971a657..8282beeac9ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84de856ed30c568c2bb7b9ac0679772bd2737d9b +refs/heads/master: 2fa389c5eb8c97d621653184d2adf5fdbd4a3167 diff --git a/trunk/fs/dquot.c b/trunk/fs/dquot.c index 343c03655619..37212b039a4a 100644 --- a/trunk/fs/dquot.c +++ b/trunk/fs/dquot.c @@ -1522,11 +1522,10 @@ int vfs_quota_on(struct super_block *sb, int type, int format_id, char *path) int vfs_quota_on_mount(struct super_block *sb, char *qf_name, int format_id, int type) { - struct qstr name = {.name = qf_name, .len = 0, .len = strlen(qf_name)}; struct dentry *dentry; int error; - dentry = lookup_hash(&name, sb->s_root); + dentry = lookup_one_len(qf_name, sb->s_root, strlen(qf_name)); if (IS_ERR(dentry)) return PTR_ERR(dentry); @@ -1534,12 +1533,6 @@ int vfs_quota_on_mount(struct super_block *sb, char *qf_name, if (!error) error = vfs_quota_on_inode(dentry->d_inode, type, format_id); - /* - * Now invalidate and put the dentry - quota got its own reference - * to inode and dentry has at least wrong hash so we had better - * throw it away. - */ - d_invalidate(dentry); dput(dentry); return error; }