Commit 84de856e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds

[PATCH] quota: consolidate code surrounding vfs_quota_on_mount

Move some code duplicated in both callers into vfs_quota_on_mount
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarJan Kara <jack@ucw.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent df164db5
...@@ -1519,14 +1519,29 @@ int vfs_quota_on(struct super_block *sb, int type, int format_id, char *path) ...@@ -1519,14 +1519,29 @@ int vfs_quota_on(struct super_block *sb, int type, int format_id, char *path)
* This function is used when filesystem needs to initialize quotas * This function is used when filesystem needs to initialize quotas
* during mount time. * 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; int error;
dentry = lookup_hash(&name, sb->s_root);
if (IS_ERR(dentry))
return PTR_ERR(dentry);
error = security_quota_on(dentry); error = security_quota_on(dentry);
if (error) 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; return error;
return vfs_quota_on_inode(dentry->d_inode, type, format_id);
} }
/* Generic routine for getting common part of quota structure */ /* Generic routine for getting common part of quota structure */
......
...@@ -2348,22 +2348,8 @@ static int ext3_write_info(struct super_block *sb, int type) ...@@ -2348,22 +2348,8 @@ static int ext3_write_info(struct super_block *sb, int type)
*/ */
static int ext3_quota_on_mount(struct super_block *sb, int type) static int ext3_quota_on_mount(struct super_block *sb, int type)
{ {
int err; return vfs_quota_on_mount(sb, EXT3_SB(sb)->s_qf_names[type],
struct dentry *dentry; EXT3_SB(sb)->s_jquota_fmt, type);
struct qstr name = { .name = EXT3_SB(sb)->s_qf_names[type],
.hash = 0,
.len = strlen(EXT3_SB(sb)->s_qf_names[type])};
dentry = lookup_hash(&name, sb->s_root);
if (IS_ERR(dentry))
return PTR_ERR(dentry);
err = vfs_quota_on_mount(type, EXT3_SB(sb)->s_jquota_fmt, dentry);
/* 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 err;
} }
/* /*
......
...@@ -1932,27 +1932,12 @@ static int reiserfs_write_info(struct super_block *sb, int type) ...@@ -1932,27 +1932,12 @@ static int reiserfs_write_info(struct super_block *sb, int type)
} }
/* /*
* Turn on quotas during mount time - we need to find * Turn on quotas during mount time - we need to find the quota file and such...
* the quota file and such...
*/ */
static int reiserfs_quota_on_mount(struct super_block *sb, int type) static int reiserfs_quota_on_mount(struct super_block *sb, int type)
{ {
int err; return vfs_quota_on_mount(sb, REISERFS_SB(sb)->s_qf_names[type],
struct dentry *dentry; REISERFS_SB(sb)->s_jquota_fmt, type);
struct qstr name = { .name = REISERFS_SB(sb)->s_qf_names[type],
.hash = 0,
.len = strlen(REISERFS_SB(sb)->s_qf_names[type])};
dentry = lookup_hash(&name, sb->s_root);
if (IS_ERR(dentry))
return PTR_ERR(dentry);
err = vfs_quota_on_mount(type, REISERFS_SB(sb)->s_jquota_fmt, dentry);
/* 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 err;
} }
/* /*
......
...@@ -39,7 +39,8 @@ extern int dquot_commit_info(struct super_block *sb, int type); ...@@ -39,7 +39,8 @@ extern int dquot_commit_info(struct super_block *sb, int type);
extern int dquot_mark_dquot_dirty(struct dquot *dquot); extern int dquot_mark_dquot_dirty(struct dquot *dquot);
extern int vfs_quota_on(struct super_block *sb, int type, int format_id, char *path); extern int vfs_quota_on(struct super_block *sb, int type, int format_id, char *path);
extern int vfs_quota_on_mount(int type, int format_id, struct dentry *dentry); extern int vfs_quota_on_mount(struct super_block *sb, char *qf_name,
int format_id, int type);
extern int vfs_quota_off(struct super_block *sb, int type); extern int vfs_quota_off(struct super_block *sb, int type);
#define vfs_quota_off_mount(sb, type) vfs_quota_off(sb, type) #define vfs_quota_off_mount(sb, type) vfs_quota_off(sb, type)
extern int vfs_quota_sync(struct super_block *sb, int type); extern int vfs_quota_sync(struct super_block *sb, int type);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment