Prechádzať zdrojové kódy

xfs: remove xfs_buf_target_name

The calling convention that returns a pointer to a static buffer is
fairly nasty, so just opencode it in the only caller that is left.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
Christoph Hellwig 13 rokov pred
rodič
commit
02b102df15
2 zmenil súbory, kde vykonal 5 pridanie a 10 odobranie
  1. 5 1
      fs/xfs/xfs_buf.c
  2. 0 9
      fs/xfs/xfs_buf.h

+ 5 - 1
fs/xfs/xfs_buf.c

@@ -1457,9 +1457,13 @@ xfs_setsize_buftarg_flags(
 	btp->bt_smask = sectorsize - 1;
 	btp->bt_smask = sectorsize - 1;
 
 
 	if (set_blocksize(btp->bt_bdev, sectorsize)) {
 	if (set_blocksize(btp->bt_bdev, sectorsize)) {
+		char name[BDEVNAME_SIZE];
+
+		bdevname(btp->bt_bdev, name);
+
 		xfs_warn(btp->bt_mount,
 		xfs_warn(btp->bt_mount,
 			"Cannot set_blocksize to %u on device %s\n",
 			"Cannot set_blocksize to %u on device %s\n",
-			sectorsize, xfs_buf_target_name(btp));
+			sectorsize, name);
 		return EINVAL;
 		return EINVAL;
 	}
 	}
 
 

+ 0 - 9
fs/xfs/xfs_buf.h

@@ -230,15 +230,6 @@ extern void xfs_buf_delwri_promote(struct xfs_buf *);
 extern int xfs_buf_init(void);
 extern int xfs_buf_init(void);
 extern void xfs_buf_terminate(void);
 extern void xfs_buf_terminate(void);
 
 
-static inline const char *
-xfs_buf_target_name(struct xfs_buftarg *target)
-{
-	static char __b[BDEVNAME_SIZE];
-
-	return bdevname(target->bt_bdev, __b);
-}
-
-
 #define XFS_BUF_ZEROFLAGS(bp) \
 #define XFS_BUF_ZEROFLAGS(bp) \
 	((bp)->b_flags &= ~(XBF_READ|XBF_WRITE|XBF_ASYNC|XBF_DELWRI| \
 	((bp)->b_flags &= ~(XBF_READ|XBF_WRITE|XBF_ASYNC|XBF_DELWRI| \
 			    XBF_SYNCIO|XBF_FUA|XBF_FLUSH))
 			    XBF_SYNCIO|XBF_FUA|XBF_FLUSH))