Skip to content

Commit

Permalink
xfs: Check the return value of xfs_trans_get_buf()
Browse files Browse the repository at this point in the history
Check the return value of xfs_trans_get_buf() and fail
appropriately.

Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
  • Loading branch information
Chandra Seetharaman authored and Alex Elder committed Oct 12, 2011
1 parent b522950 commit 2a30f36
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 11 deletions.
2 changes: 2 additions & 0 deletions fs/xfs/xfs_attr_leaf.c
Original file line number Diff line number Diff line change
Expand Up @@ -2948,6 +2948,8 @@ xfs_attr_leaf_freextent(xfs_trans_t **trans, xfs_inode_t *dp,
bp = xfs_trans_get_buf(*trans,
dp->i_mount->m_ddev_targp,
dblkno, dblkcnt, XBF_LOCK);
if (!bp)
return ENOMEM;
xfs_trans_binval(*trans, bp);
/*
* Roll to next transaction.
Expand Down
3 changes: 2 additions & 1 deletion fs/xfs/xfs_btree.c
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,8 @@ xfs_btree_get_buf_block(
*bpp = xfs_trans_get_buf(cur->bc_tp, mp->m_ddev_targp, d,
mp->m_bsize, flags);

ASSERT(!xfs_buf_geterror(*bpp));
if (!*bpp)
return ENOMEM;

*block = XFS_BUF_TO_BLOCK(*bpp);
return 0;
Expand Down
5 changes: 4 additions & 1 deletion fs/xfs/xfs_dquot.c
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,11 @@ xfs_qm_dqalloc(
dqp->q_blkno,
mp->m_quotainfo->qi_dqchunklen,
0);
if (!bp || (error = xfs_buf_geterror(bp)))

error = xfs_buf_geterror(bp);
if (error)
goto error1;

/*
* Make a chunk of dquots out of this buffer and log
* the entire thing.
Expand Down
13 changes: 8 additions & 5 deletions fs/xfs/xfs_ialloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ xfs_check_agi_freecount(
/*
* Initialise a new set of inodes.
*/
STATIC void
STATIC int
xfs_ialloc_inode_init(
struct xfs_mount *mp,
struct xfs_trans *tp,
Expand Down Expand Up @@ -202,8 +202,8 @@ xfs_ialloc_inode_init(
fbuf = xfs_trans_get_buf(tp, mp->m_ddev_targp, d,
mp->m_bsize * blks_per_cluster,
XBF_LOCK);
ASSERT(!xfs_buf_geterror(fbuf));

if (!fbuf)
return ENOMEM;
/*
* Initialize all inodes in this buffer and then log them.
*
Expand All @@ -225,6 +225,7 @@ xfs_ialloc_inode_init(
}
xfs_trans_inode_alloc_buf(tp, fbuf);
}
return 0;
}

/*
Expand Down Expand Up @@ -369,9 +370,11 @@ xfs_ialloc_ag_alloc(
* rather than a linear progression to prevent the next generation
* number from being easily guessable.
*/
xfs_ialloc_inode_init(args.mp, tp, agno, args.agbno, args.len,
random32());
error = xfs_ialloc_inode_init(args.mp, tp, agno, args.agbno,
args.len, random32());

if (error)
return error;
/*
* Convert the results.
*/
Expand Down
9 changes: 6 additions & 3 deletions fs/xfs/xfs_inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -1644,7 +1644,7 @@ xfs_iunlink_remove(
* inodes that are in memory - they all must be marked stale and attached to
* the cluster buffer.
*/
STATIC void
STATIC int
xfs_ifree_cluster(
xfs_inode_t *free_ip,
xfs_trans_t *tp,
Expand Down Expand Up @@ -1690,6 +1690,8 @@ xfs_ifree_cluster(
mp->m_bsize * blks_per_cluster,
XBF_LOCK);

if (!bp)
return ENOMEM;
/*
* Walk the inodes already attached to the buffer and mark them
* stale. These will all have the flush locks held, so an
Expand Down Expand Up @@ -1799,6 +1801,7 @@ xfs_ifree_cluster(
}

xfs_perag_put(pag);
return 0;
}

/*
Expand Down Expand Up @@ -1878,10 +1881,10 @@ xfs_ifree(
dip->di_mode = 0;

if (delete) {
xfs_ifree_cluster(ip, tp, first_ino);
error = xfs_ifree_cluster(ip, tp, first_ino);
}

return 0;
return error;
}

/*
Expand Down
9 changes: 8 additions & 1 deletion fs/xfs/xfs_vnodeops.c
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,10 @@ xfs_inactive_symlink_rmt(
bp = xfs_trans_get_buf(tp, mp->m_ddev_targp,
XFS_FSB_TO_DADDR(mp, mval[i].br_startblock),
XFS_FSB_TO_BB(mp, mval[i].br_blockcount), 0);
if (!bp) {
error = ENOMEM;
goto error1;
}
xfs_trans_binval(tp, bp);
}
/*
Expand Down Expand Up @@ -1648,7 +1652,10 @@ xfs_symlink(
byte_cnt = XFS_FSB_TO_B(mp, mval[n].br_blockcount);
bp = xfs_trans_get_buf(tp, mp->m_ddev_targp, d,
BTOBB(byte_cnt), 0);
ASSERT(!xfs_buf_geterror(bp));
if (!bp) {
error = ENOMEM;
goto error2;
}
if (pathlen < byte_cnt) {
byte_cnt = pathlen;
}
Expand Down

0 comments on commit 2a30f36

Please sign in to comment.