gfs2: eliminate gfs2_rsqa_alloc in favor of gfs2_qa_alloc
Before this patch, multiple callers called gfs2_rsqa_alloc to force the existence of a reservations structure and a quota data structure if needed. However, now the reservations are handled separately, so the quota data is only the quota data. So we eliminate the one in favor of just calling gfs2_qa_alloc directly. Signed-off-by: Bob Peterson <rpeterso@redhat.com>
This commit is contained in:
@@ -588,7 +588,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
|
||||
if (!name->len || name->len > GFS2_FNAMESIZE)
|
||||
return -ENAMETOOLONG;
|
||||
|
||||
error = gfs2_rsqa_alloc(dip);
|
||||
error = gfs2_qa_alloc(dip);
|
||||
if (error)
|
||||
return error;
|
||||
|
||||
@@ -641,7 +641,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
|
||||
goto fail_gunlock;
|
||||
|
||||
ip = GFS2_I(inode);
|
||||
error = gfs2_rsqa_alloc(ip);
|
||||
error = gfs2_qa_alloc(ip);
|
||||
if (error)
|
||||
goto fail_free_acls;
|
||||
|
||||
@@ -899,7 +899,7 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
|
||||
if (S_ISDIR(inode->i_mode))
|
||||
return -EPERM;
|
||||
|
||||
error = gfs2_rsqa_alloc(dip);
|
||||
error = gfs2_qa_alloc(dip);
|
||||
if (error)
|
||||
return error;
|
||||
|
||||
@@ -1362,7 +1362,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
|
||||
if (error)
|
||||
return error;
|
||||
|
||||
error = gfs2_rsqa_alloc(ndip);
|
||||
error = gfs2_qa_alloc(ndip);
|
||||
if (error)
|
||||
return error;
|
||||
|
||||
@@ -1874,7 +1874,7 @@ static int setattr_chown(struct inode *inode, struct iattr *attr)
|
||||
if (!(attr->ia_valid & ATTR_GID) || gid_eq(ogid, ngid))
|
||||
ogid = ngid = NO_GID_QUOTA_CHANGE;
|
||||
|
||||
error = gfs2_rsqa_alloc(ip);
|
||||
error = gfs2_qa_alloc(ip);
|
||||
if (error)
|
||||
goto out;
|
||||
|
||||
@@ -1935,7 +1935,7 @@ static int gfs2_setattr(struct dentry *dentry, struct iattr *attr)
|
||||
struct gfs2_holder i_gh;
|
||||
int error;
|
||||
|
||||
error = gfs2_rsqa_alloc(ip);
|
||||
error = gfs2_qa_alloc(ip);
|
||||
if (error)
|
||||
return error;
|
||||
|
||||
|
Reference in New Issue
Block a user