X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fdquot.c;h=37212b039a4ab834770bfd663f503dcaa669a37a;hb=e8e1c7292ee9b64c35b3f6d7f905ca5e854aea95;hp=3995ce7907ccbcfb276fa694cfa4bc98ddd8cc69;hpb=31e7ad6ac919761f0486f7781b02ff3ab54b6ef1;p=linux-2.6 diff --git a/fs/dquot.c b/fs/dquot.c index 3995ce7907..37212b039a 100644 --- a/fs/dquot.c +++ b/fs/dquot.c @@ -1519,14 +1519,22 @@ 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 dentry *dentry; int error; + dentry = lookup_one_len(qf_name, sb->s_root, strlen(qf_name)); + 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); + + dput(dentry); + return error; } /* Generic routine for getting common part of quota structure */