summaryrefslogtreecommitdiff
path: root/fs/dquot.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2005-06-23 11:09:16 +0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-23 20:45:20 +0400
commit84de856ed30c568c2bb7b9ac0679772bd2737d9b (patch)
tree532e4f6bcc0db2d1baf0455484ec7f64a2a51e71 /fs/dquot.c
parentdf164db5fd16888ddbe2a63a47b2f6dda9a428b5 (diff)
downloadlinux-84de856ed30c568c2bb7b9ac0679772bd2737d9b.tar.xz
[PATCH] quota: consolidate code surrounding vfs_quota_on_mount
Move some code duplicated in both callers into vfs_quota_on_mount Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Jan Kara <jack@ucw.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/dquot.c')
-rw-r--r--fs/dquot.c23
1 files changed, 19 insertions, 4 deletions
diff --git a/fs/dquot.c b/fs/dquot.c
index 3995ce7907cc..343c03655619 100644
--- a/fs/dquot.c
+++ b/fs/dquot.c
@@ -1519,14 +1519,29 @@ out_path:
* This function is used when filesystem needs to initialize quotas
* during mount time.
*/
-int vfs_quota_on_mount(int type, int format_id, struct dentry *dentry)
+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);
+ if (IS_ERR(dentry))
+ return PTR_ERR(dentry);
+
error = security_quota_on(dentry);
- if (error)
- return error;
- return vfs_quota_on_inode(dentry->d_inode, type, format_id);
+ 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;
}
/* Generic routine for getting common part of quota structure */