leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] quota: consolidate code surrounding vfs_quota_on_mount

Browse Source 
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>
This commit is contained in:
Christoph Hellwig 2005-06-23 00:09:16 -07:00 committed by Linus Torvalds
parent df164db5fd
commit 84de856ed3
4 changed files with 26 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fs/dquot.c
View File

@ -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 */

18
fs/ext3/super.c
View File

@ -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)
{
int err;
struct dentry *dentry;
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;
return vfs_quota_on_mount(sb, EXT3_SB(sb)->s_qf_names[type],
EXT3_SB(sb)->s_jquota_fmt, type);
}
/*

21
fs/reiserfs/super.c
View File

@ -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
* the quota file and such...
* Turn on quotas during mount time - we need to find the quota file and such...
*/
static int reiserfs_quota_on_mount(struct super_block *sb, int type)
{
int err;
struct dentry *dentry;
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;
return vfs_quota_on_mount(sb, REISERFS_SB(sb)->s_qf_names[type],
REISERFS_SB(sb)->s_jquota_fmt, type);
}
/*

3
include/linux/quotaops.h
View File

@ -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 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);
#define vfs_quota_off_mount(sb, type) vfs_quota_off(sb, type)
extern int vfs_quota_sync(struct super_block *sb, int type);