diff options
Diffstat (limited to 'fs/gfs2/ops_inode.c')
-rw-r--r-- | fs/gfs2/ops_inode.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c index cf7a5bae3957..efbcec3311bb 100644 --- a/fs/gfs2/ops_inode.c +++ b/fs/gfs2/ops_inode.c | |||
@@ -196,8 +196,7 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir, | |||
196 | if (error) | 196 | if (error) |
197 | goto out_alloc; | 197 | goto out_alloc; |
198 | 198 | ||
199 | error = gfs2_quota_check(dip, dip->i_di.di_uid, | 199 | error = gfs2_quota_check(dip, dip->i_inode.i_uid, dip->i_inode.i_gid); |
200 | dip->i_di.di_gid); | ||
201 | if (error) | 200 | if (error) |
202 | goto out_gunlock_q; | 201 | goto out_gunlock_q; |
203 | 202 | ||
@@ -673,8 +672,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry, | |||
673 | if (error) | 672 | if (error) |
674 | goto out_alloc; | 673 | goto out_alloc; |
675 | 674 | ||
676 | error = gfs2_quota_check(ndip, ndip->i_di.di_uid, | 675 | error = gfs2_quota_check(ndip, ndip->i_inode.i_uid, ndip->i_inode.i_gid); |
677 | ndip->i_di.di_gid); | ||
678 | if (error) | 676 | if (error) |
679 | goto out_gunlock_q; | 677 | goto out_gunlock_q; |
680 | 678 | ||
@@ -885,8 +883,8 @@ static int setattr_chown(struct inode *inode, struct iattr *attr) | |||
885 | u32 ouid, ogid, nuid, ngid; | 883 | u32 ouid, ogid, nuid, ngid; |
886 | int error; | 884 | int error; |
887 | 885 | ||
888 | ouid = ip->i_di.di_uid; | 886 | ouid = inode->i_uid; |
889 | ogid = ip->i_di.di_gid; | 887 | ogid = inode->i_gid; |
890 | nuid = attr->ia_uid; | 888 | nuid = attr->ia_uid; |
891 | ngid = attr->ia_gid; | 889 | ngid = attr->ia_gid; |
892 | 890 | ||