xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfs: make xfs_buf_get return an error code

Browse Source 
Convert xfs_buf_get() to return numeric error codes like most
everywhere else in xfs.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
This commit is contained in:
Darrick J. Wong
2020-01-23 17:01:16 -08:00
parent 4ed8e27b4f
commit 841263e933
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/xfs/libxfs/xfs_attr_remote.c
View File

@@ -545,9 +545,9 @@ xfs_attr_rmtval_set(
dblkno = XFS_FSB_TO_DADDR(mp, map.br_startblock), dblkno = XFS_FSB_TO_DADDR(mp, map.br_startblock),
dblkcnt = XFS_FSB_TO_BB(mp, map.br_blockcount); dblkcnt = XFS_FSB_TO_BB(mp, map.br_blockcount);
bp = xfs_buf_get(mp->m_ddev_targp, dblkno, dblkcnt); error = xfs_buf_get(mp->m_ddev_targp, dblkno, dblkcnt, &bp);
if (!bp) if (error)
return -ENOMEM; return error;
bp->b_ops = &xfs_attr3_rmt_buf_ops; bp->b_ops = &xfs_attr3_rmt_buf_ops;
xfs_attr_rmtval_copyin(mp, bp, args->dp->i_ino, &offset, xfs_attr_rmtval_copyin(mp, bp, args->dp->i_ino, &offset,

8
fs/xfs/libxfs/xfs_sb.c
View File

@@ -985,9 +985,9 @@ xfs_update_secondary_sbs(
for (agno = 1; agno < mp->m_sb.sb_agcount; agno++) { for (agno = 1; agno < mp->m_sb.sb_agcount; agno++) {
struct xfs_buf *bp; struct xfs_buf *bp;
bp = xfs_buf_get(mp->m_ddev_targp, error = xfs_buf_get(mp->m_ddev_targp,
XFS_AG_DADDR(mp, agno, XFS_SB_DADDR), XFS_AG_DADDR(mp, agno, XFS_SB_DADDR),
XFS_FSS_TO_BB(mp, 1)); XFS_FSS_TO_BB(mp, 1), &bp);
/* /*
* If we get an error reading or writing alternate superblocks, * If we get an error reading or writing alternate superblocks,
* continue. xfs_repair chooses the "best" superblock based * continue. xfs_repair chooses the "best" superblock based
@@ -995,12 +995,12 @@ xfs_update_secondary_sbs(
* superblocks un-updated than updated, and xfs_repair may * superblocks un-updated than updated, and xfs_repair may
* pick them over the properly-updated primary. * pick them over the properly-updated primary.
*/ */
if (!bp) { if (error) {
xfs_warn(mp, xfs_warn(mp,
"error allocating secondary superblock for ag %d", "error allocating secondary superblock for ag %d",
agno); agno);
if (!saved_error) if (!saved_error)
saved_error = -ENOMEM; saved_error = error;
continue; continue;
} }

12
fs/xfs/xfs_buf.h
View File

@@ -201,20 +201,16 @@ void xfs_buf_readahead_map(struct xfs_buftarg *target,
struct xfs_buf_map *map, int nmaps, struct xfs_buf_map *map, int nmaps,
const struct xfs_buf_ops *ops); const struct xfs_buf_ops *ops);
static inline struct xfs_buf * static inline int
xfs_buf_get( xfs_buf_get(
struct xfs_buftarg *target, struct xfs_buftarg *target,
xfs_daddr_t blkno, xfs_daddr_t blkno,
size_t numblks) size_t numblks,
struct xfs_buf **bpp)
{ {
struct xfs_buf *bp;
int error;
DEFINE_SINGLE_BUF_MAP(map, blkno, numblks); DEFINE_SINGLE_BUF_MAP(map, blkno, numblks);
error = xfs_buf_get_map(target, &map, 1, 0, &bp); return xfs_buf_get_map(target, &map, 1, 0, bpp);
if (error)
return NULL;
return bp;
} }
static inline struct xfs_buf * static inline struct xfs_buf *