Merge branch 'xfs-misc-fixes-3-for-3.16' into for-next

2014-06-10 07:32:56 +10:00
parent 8612c7e594 30265117ee
commit 7691283d05
13 changed files with 60 additions and 53 deletions
--- 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;

 	/*