summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_dquot.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2014-06-10 07:32:56 +1000
committerDave Chinner <david@fromorbit.com>2014-06-10 07:32:56 +1000
commit7691283d0561a350b7517be94818669fb5e3d910 (patch)
tree3b939ee86e763c22c6ead988bf62de58e1981915 /fs/xfs/xfs_dquot.c
parent8612c7e594808e4a67bc2d4661f5925df2be3f51 (diff)
parent30265117ee1e23fa91920f337a3ea91207f700dc (diff)
downloadop-kernel-dev-7691283d0561a350b7517be94818669fb5e3d910.zip
op-kernel-dev-7691283d0561a350b7517be94818669fb5e3d910.tar.gz
Merge branch 'xfs-misc-fixes-3-for-3.16' into for-next
Diffstat (limited to 'fs/xfs/xfs_dquot.c')
-rw-r--r--fs/xfs/xfs_dquot.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index 5fec738..3ee0cd4 100644
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -353,10 +353,10 @@ xfs_qm_dqalloc(
dqp->q_blkno,
mp->m_quotainfo->qi_dqchunklen,
0);
-
- error = xfs_buf_geterror(bp);
- if (error)
+ if (!bp) {
+ error = ENOMEM;
goto error1;
+ }
bp->b_ops = &xfs_dquot_buf_ops;
/*
OpenPOWER on IntegriCloud