From: Darrick J. Wong Date: Sun, 1 Mar 2020 17:34:11 +0000 (-0500) Subject: libxfs: remove libxfs_writebuf_int X-Git-Tag: v5.5.0-rc1~9 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e8bef598ddf31ee5cb691d63e2232135bfe9c6ce;p=users%2Fhch%2Fxfsprogs.git libxfs: remove libxfs_writebuf_int This function is the same as libxfs_buf_dirty so use that instead. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Eric Sandeen --- diff --git a/libxfs/libxfs_io.h b/libxfs/libxfs_io.h index 78ce989c5..646e340b3 100644 --- a/libxfs/libxfs_io.h +++ b/libxfs/libxfs_io.h @@ -217,7 +217,6 @@ extern int libxfs_bcache_overflowed(void); extern xfs_buf_t *libxfs_getbufr(struct xfs_buftarg *, xfs_daddr_t, int); extern void libxfs_putbufr(xfs_buf_t *); -extern int libxfs_writebuf_int(xfs_buf_t *, int); int libxfs_bwrite(struct xfs_buf *bp); extern int libxfs_readbufr(struct xfs_buftarg *, xfs_daddr_t, xfs_buf_t *, int, int); extern int libxfs_readbufr_map(struct xfs_buftarg *, struct xfs_buf *, int); diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c index db6f23882..bb925711f 100644 --- a/libxfs/rdwr.c +++ b/libxfs/rdwr.c @@ -986,19 +986,6 @@ libxfs_bwrite( return bp->b_error; } -int -libxfs_writebuf_int(xfs_buf_t *bp, int flags) -{ - /* - * Clear any error hanging over from reading the buffer. This prevents - * subsequent reads after this write from seeing stale errors. - */ - bp->b_error = 0; - bp->b_flags &= ~LIBXFS_B_STALE; - bp->b_flags |= (LIBXFS_B_DIRTY | flags); - return 0; -} - /* * Mark a buffer dirty. The dirty data will be written out when the cache * is flushed (or at release time if the buffer is uncached). diff --git a/libxfs/trans.c b/libxfs/trans.c index ca1166ed7..df1ec90b1 100644 --- a/libxfs/trans.c +++ b/libxfs/trans.c @@ -863,7 +863,7 @@ buf_item_done( hold = (bip->bli_flags & XFS_BLI_HOLD); if (bip->bli_flags & XFS_BLI_DIRTY) - libxfs_writebuf_int(bp, 0); + libxfs_buf_mark_dirty(bp); bip->bli_flags &= ~XFS_BLI_HOLD; xfs_buf_item_put(bip);