diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-12-11 09:16:26 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-12-11 09:16:26 -0500 |
| commit | 7ce0171d4f78992184faed87ea897d730b972965 (patch) | |
| tree | 71dba7444672eb10244566e6f0ed7829f1e3abf5 /fs/gfs2/quota.c | |
| parent | 1fa8064429d0acbf5bbf3c8a53f65679fdacc75e (diff) | |
| parent | 81d9bce5309288086b58b4d97a644e495fef75f2 (diff) | |
Merge branch 'bugfixes' into nfs-for-next
Diffstat (limited to 'fs/gfs2/quota.c')
| -rw-r--r-- | fs/gfs2/quota.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c index 40c4b0d42fa8..c5af8e18f27a 100644 --- a/fs/gfs2/quota.c +++ b/fs/gfs2/quota.c @@ -497,8 +497,11 @@ int gfs2_quota_hold(struct gfs2_inode *ip, u32 uid, u32 gid) struct gfs2_quota_data **qd; int error; - if (ip->i_res == NULL) - gfs2_rs_alloc(ip); + if (ip->i_res == NULL) { + error = gfs2_rs_alloc(ip); + if (error) + return error; + } qd = ip->i_res->rs_qa_qd; |