Skip to contentSkip to conversation

xfs: merge xfs_buf_zero and xfs_buf_iomove

PATCH Superseded Christoph Hellwig 2 participants 2 messages May 15, 2019 XFS filesystem

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfs: merge xfs_buf_zero and xfs_buf_iomove

xfs_buf_zero is the only caller of xfs_buf_iomove. Remove support for copying from or to the buffer in xfs_buf_iomove and merge the two functions.

---
 fs/xfs/xfs_buf.c | 18 +++---------------
 fs/xfs/xfs_buf.h | 11 +----------
 2 files changed, 4 insertions(+), 25 deletions(-)
fs/xfs/xfs_buf.c +3 -15
index 548344e25128..c66788dbaaba 100644
@@ -1617,12 +1617,10 @@ xfs_buf_offset(
  *	Move data into or out of a buffer.
  */
 void
-xfs_buf_iomove(
+xfs_buf_zero(
 	xfs_buf_t		*bp,	/* buffer to process		*/
 	size_t			boff,	/* starting buffer offset	*/
-	size_t			bsize,	/* length to copy		*/
-	void			*data,	/* data address			*/
-	xfs_buf_rw_t		mode)	/* read/write/zero flag		*/
+	size_t			bsize)	/* length to copy		*/
 {
 	size_t			bend;
 
@@ -1639,19 +1637,9 @@ xfs_buf_iomove(
 
 		ASSERT((csize + page_offset) <= PAGE_SIZE);
 
-		switch (mode) {
-		case XBRW_ZERO:
-			memset(page_address(page) + page_offset, 0, csize);
-			break;
-		case XBRW_READ:
-			memcpy(data, page_address(page) + page_offset, csize);
-			break;
-		case XBRW_WRITE:
-			memcpy(page_address(page) + page_offset, data, csize);
-		}
+		memset(page_address(page) + page_offset, 0, csize);
 
 		boff += csize;
-		data += csize;
 	}
 }
 
fs/xfs/xfs_buf.h +1 -10
index d0b96e071cec..1701efee4fd4 100644
@@ -21,12 +21,6 @@
 
 #define XFS_BUF_DADDR_NULL	((xfs_daddr_t) (-1LL))
 
-typedef enum {
-	XBRW_READ = 1,			/* transfer into target memory */
-	XBRW_WRITE = 2,			/* transfer from target memory */
-	XBRW_ZERO = 3,			/* Zero target memory */
-} xfs_buf_rw_t;
-
 #define XBF_READ	 (1 << 0) /* buffer intended for reading from device */
 #define XBF_WRITE	 (1 << 1) /* buffer intended for writing to device */
 #define XBF_READ_AHEAD	 (1 << 2) /* asynchronous read-ahead */
@@ -305,10 +299,7 @@ static inline int xfs_buf_submit(struct xfs_buf *bp)
 	return __xfs_buf_submit(bp, wait);
 }
 
-extern void xfs_buf_iomove(xfs_buf_t *, size_t, size_t, void *,
-				xfs_buf_rw_t);
-#define xfs_buf_zero(bp, off, len) \
-	    xfs_buf_iomove((bp), (off), (len), NULL, XBRW_ZERO)
+void xfs_buf_zero(struct xfs_buf *bp, size_t boff, size_t bsize);
 
 /* Buffer Utility Routines */
 extern void *xfs_buf_offset(struct xfs_buf *, size_t);
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 15 lines · Christoph Hellwig

xfs_buf_zero is the only caller of xfs_buf_iomove. Remove support for copying from or to the buffer in xfs_buf_iomove and merge the two functions.

---
 fs/xfs/xfs_buf.c | 18 +++---------------
 fs/xfs/xfs_buf.h | 11 +----------
 2 files changed, 4 insertions(+), 25 deletions(-)
fs/xfs/xfs_buf.c +0 -0
index 548344e25128..c66788dbaaba 100644

fs/xfs/xfs_buf.c xfs_buf_offset( · line 1618

Quoted 2 lines
fs/xfs/xfs_buf.c +0 -0
@@ -1617,12 +1617,10 @@ xfs_buf_offset(
  *	Move data into or out of a buffer.
  */

This comment is now stale.

fs/xfs/xfs_buf.c xfs_buf_offset( · line 1621

Quoted 4 lines
fs/xfs/xfs_buf.c +1 -1
 void
-xfs_buf_iomove(
+xfs_buf_zero(
 	xfs_buf_t		*bp,	/* buffer to process		*/

Can we kill off this typedef too? Nits aside:

Quoted 61 lines
fs/xfs/xfs_buf.c +2 -14
 	size_t			boff,	/* starting buffer offset	*/
-	size_t			bsize,	/* length to copy		*/
-	void			*data,	/* data address			*/
-	xfs_buf_rw_t		mode)	/* read/write/zero flag		*/
+	size_t			bsize)	/* length to copy		*/
 {
 	size_t			bend;
 
@@ -1639,19 +1637,9 @@ xfs_buf_iomove(
 
 		ASSERT((csize + page_offset) <= PAGE_SIZE);
 
-		switch (mode) {
-		case XBRW_ZERO:
-			memset(page_address(page) + page_offset, 0, csize);
-			break;
-		case XBRW_READ:
-			memcpy(data, page_address(page) + page_offset, csize);
-			break;
-		case XBRW_WRITE:
-			memcpy(page_address(page) + page_offset, data, csize);
-		}
+		memset(page_address(page) + page_offset, 0, csize);
 
 		boff += csize;
-		data += csize;
 	}
 }
 
fs/xfs/xfs_buf.h +1 -10
index d0b96e071cec..1701efee4fd4 100644
@@ -21,12 +21,6 @@
 
 #define XFS_BUF_DADDR_NULL	((xfs_daddr_t) (-1LL))
 
-typedef enum {
-	XBRW_READ = 1,			/* transfer into target memory */
-	XBRW_WRITE = 2,			/* transfer from target memory */
-	XBRW_ZERO = 3,			/* Zero target memory */
-} xfs_buf_rw_t;
-
 #define XBF_READ	 (1 << 0) /* buffer intended for reading from device */
 #define XBF_WRITE	 (1 << 1) /* buffer intended for writing to device */
 #define XBF_READ_AHEAD	 (1 << 2) /* asynchronous read-ahead */
@@ -305,10 +299,7 @@ static inline int xfs_buf_submit(struct xfs_buf *bp)
 	return __xfs_buf_submit(bp, wait);
 }
 
-extern void xfs_buf_iomove(xfs_buf_t *, size_t, size_t, void *,
-				xfs_buf_rw_t);
-#define xfs_buf_zero(bp, off, len) \
-	    xfs_buf_iomove((bp), (off), (len), NULL, XBRW_ZERO)
+void xfs_buf_zero(struct xfs_buf *bp, size_t boff, size_t bsize);
 
 /* Buffer Utility Routines */
 extern void *xfs_buf_offset(struct xfs_buf *, size_t);
Signature · 1 line
2.20.1