libxfs: remove libxfs_iomove

This function has been removed in the kernel already.  Replace the only
user that want to zero buffers with a straight call to memset.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/libxfs_io.h b/libxfs/libxfs_io.h
index 55ac6df52beff144ef1f778ed49197760c3b1aa5..b4f0beab5a13e127d4960d7d7a07e0118217a21a 100644 (file)
--- a/libxfs/libxfs_io.h
+++ b/libxfs/libxfs_io.h
@@ -221,12 +221,6 @@ extern int libxfs_device_zero(struct xfs_buftarg *, xfs_daddr_t, uint);
 
 extern int libxfs_bhash_size;
 
-#define LIBXFS_BREAD   0x1
-#define LIBXFS_BWRITE  0x2
-#define LIBXFS_BZERO   0x4
-
-extern void    libxfs_iomove (xfs_buf_t *, uint, int, void *, int);
-
 static inline int
 xfs_buf_verify_cksum(struct xfs_buf *bp, unsigned long cksum_offset)
 {

diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
index 820f111c009c59fcda24d9b3c924795f5573d080..68b6c0f0fcf7d5a87a526a2c47b971af4956eccb 100644 (file)
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -378,9 +378,8 @@ static inline struct xfs_buf *xfs_buf_incore(struct xfs_buftarg *target,
 
 #define xfs_buf_oneshot(bp)            ((void) 0)
 
-#define XBRW_READ                      LIBXFS_BREAD
-#define XBRW_WRITE                     LIBXFS_BWRITE
-#define xfs_buf_zero(bp,off,len)     libxfs_iomove(bp,off,len,NULL,LIBXFS_BZERO)
+#define xfs_buf_zero(bp, off, len) \
+       memset((bp)->b_addr + off, 0, len);
 
 /* mount stuff */
 #define XFS_MOUNT_32BITINODES          LIBXFS_MOUNT_32BITINODES

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 8a6902699026f9147414ef0cc06d0267a11ad8e3..fd65651209aacc8b7144c8c9dcef7347b8ba274d 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -1060,30 +1060,6 @@ libxfs_buf_mark_dirty(
        bp->b_flags |= LIBXFS_B_DIRTY;
 }
 
-void
-libxfs_iomove(xfs_buf_t *bp, uint boff, int len, void *data, int flags)
-{
-#ifdef IO_DEBUG
-       if (boff + len > bp->b_bcount) {
-               printf("Badness, iomove out of range!\n"
-                       "bp=(bno 0x%llx, bytes %u) range=(boff %u, bytes %u)\n",
-                       (long long)bp->b_bn, bp->b_bcount, boff, len);
-               abort();
-       }
-#endif
-       switch (flags) {
-       case LIBXFS_BZERO:
-               memset(bp->b_addr + boff, 0, len);
-               break;
-       case LIBXFS_BREAD:
-               memcpy(data, bp->b_addr + boff, len);
-               break;
-       case LIBXFS_BWRITE:
-               memcpy(bp->b_addr + boff, data, len);
-               break;
-       }
-}
-
 /* Complain about (and remember) dropping dirty buffers. */
 static void
 libxfs_whine_dirty_buf(