diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-06-09 17:32:56 -0400 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-06-09 17:32:56 -0400 |
| commit | 7691283d0561a350b7517be94818669fb5e3d910 (patch) | |
| tree | 3b939ee86e763c22c6ead988bf62de58e1981915 /fs/xfs/xfs_dquot.c | |
| parent | 8612c7e594808e4a67bc2d4661f5925df2be3f51 (diff) | |
| parent | 30265117ee1e23fa91920f337a3ea91207f700dc (diff) | |
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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c index 5fec738f1f2e..3ee0cd43edc0 100644 --- a/fs/xfs/xfs_dquot.c +++ b/fs/xfs/xfs_dquot.c | |||
| @@ -353,10 +353,10 @@ xfs_qm_dqalloc( | |||
| 353 | dqp->q_blkno, | 353 | dqp->q_blkno, |
| 354 | mp->m_quotainfo->qi_dqchunklen, | 354 | mp->m_quotainfo->qi_dqchunklen, |
| 355 | 0); | 355 | 0); |
| 356 | 356 | if (!bp) { | |
| 357 | error = xfs_buf_geterror(bp); | 357 | error = ENOMEM; |
| 358 | if (error) | ||
| 359 | goto error1; | 358 | goto error1; |
| 359 | } | ||
| 360 | bp->b_ops = &xfs_dquot_buf_ops; | 360 | bp->b_ops = &xfs_dquot_buf_ops; |
| 361 | 361 | ||
| 362 | /* | 362 | /* |