@@ -2303,11 +2303,11 @@ EXPORT_SYMBOL(dquot_quota_off);
* Helper function to turn quotas on when we already have the inode of
* quota file and no quota information is loaded.
*/
-static int vfs_load_quota_inode(struct inode *inode, int type, int format_id,
+static int vfs_load_quota_inode(struct super_block *sb, struct inode *inode,
+ int type, int format_id,
unsigned int flags)
{
struct quota_format_type *fmt = find_quota_format(format_id);
- struct super_block *sb = inode->i_sb;
struct quota_info *dqopt = sb_dqopt(sb);
int error;
@@ -2443,7 +2443,7 @@ int dquot_resume(struct super_block *sb, int type)
spin_unlock(&dq_state_lock);
flags = dquot_generic_flag(flags, cnt);
- ret = vfs_load_quota_inode(inode, cnt,
+ ret = vfs_load_quota_inode(sb, inode, cnt,
dqopt->info[cnt].dqi_fmt_id, flags);
iput(inode);
}
@@ -2462,7 +2462,7 @@ int dquot_quota_on(struct super_block *sb, int type, int format_id,
if (path->dentry->d_sb != sb)
error = -EXDEV;
else
- error = vfs_load_quota_inode(d_inode(path->dentry), type,
+ error = vfs_load_quota_inode(sb, d_inode(path->dentry), type,
format_id, DQUOT_USAGE_ENABLED |
DQUOT_LIMITS_ENABLED);
return error;
@@ -2500,7 +2500,7 @@ int dquot_enable(struct inode *inode, int type, int format_id,
return 0;
}
- return vfs_load_quota_inode(inode, type, format_id, flags);
+ return vfs_load_quota_inode(sb, inode, type, format_id, flags);
}
EXPORT_SYMBOL(dquot_enable);
@@ -2525,7 +2525,7 @@ int dquot_quota_on_mount(struct super_block *sb, char *qf_name,
error = security_quota_on(dentry);
if (!error)
- error = vfs_load_quota_inode(d_inode(dentry), type, format_id,
+ error = vfs_load_quota_inode(sb, d_inode(dentry), type, format_id,
DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);
out:
As a preparation to support filesystems that do not store quota files in an inode pass the superblock to vfs_load_quota_inode(). With this we no longer have to get the superblock from the inode and thus the inode could be NULL. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- fs/quota/dquot.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)