libxfs: rename buftarg->dev to btdev

To prepare for alignment with kernel buftarg code.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/init.c b/libxfs/init.c
index 330c645190d968c959e2454818a49d9ca3bebe26..bd176b50bf63ce1862391af67d6b863ac0683498 100644 (file)
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -443,7 +443,7 @@ rtmount_init(
                return -1;
        }
 
-       if (mp->m_rtdev_targp->dev == 0 && !(flags & LIBXFS_MOUNT_DEBUGGER)) {
+       if (mp->m_rtdev_targp->bt_bdev == 0 && !(flags & LIBXFS_MOUNT_DEBUGGER)) {
                fprintf(stderr, _("%s: filesystem has a realtime subvolume\n"),
                        progname);
                return -1;
@@ -601,7 +601,7 @@ libxfs_buftarg_alloc(
                exit(1);
        }
        btp->bt_mount = mp;
-       btp->dev = dev;
+       btp->bt_bdev = dev;
        btp->flags = 0;
 
        return btp;
@@ -616,7 +616,7 @@ libxfs_buftarg_init(
 {
        if (mp->m_ddev_targp) {
                /* should already have all buftargs initialised */
-               if (mp->m_ddev_targp->dev != dev ||
+               if (mp->m_ddev_targp->bt_bdev != dev ||
                    mp->m_ddev_targp->bt_mount != mp) {
                        fprintf(stderr,
                                _("%s: bad buftarg reinit, ddev\n"),
@@ -630,14 +630,14 @@ libxfs_buftarg_init(
                                        progname);
                                exit(1);
                        }
-               } else if (mp->m_logdev_targp->dev != logdev ||
+               } else if (mp->m_logdev_targp->bt_bdev != logdev ||
                           mp->m_logdev_targp->bt_mount != mp) {
                        fprintf(stderr,
                                _("%s: bad buftarg reinit, logdev\n"),
                                progname);
                        exit(1);
                }
-               if (rtdev && (mp->m_rtdev_targp->dev != rtdev ||
+               if (rtdev && (mp->m_rtdev_targp->bt_bdev != rtdev ||
                              mp->m_rtdev_targp->bt_mount != mp)) {
                        fprintf(stderr,
                                _("%s: bad buftarg reinit, rtdev\n"),
@@ -760,8 +760,8 @@ libxfs_mount(
        } else
                libxfs_buf_relse(bp);
 
-       if (mp->m_logdev_targp->dev &&
-           mp->m_logdev_targp->dev != mp->m_ddev_targp->dev) {
+       if (mp->m_logdev_targp->bt_bdev &&
+           mp->m_logdev_targp->bt_bdev != mp->m_ddev_targp->bt_bdev) {
                d = (xfs_daddr_t) XFS_FSB_TO_BB(mp, mp->m_sb.sb_logblocks);
                if (XFS_BB_TO_FSB(mp, d) != mp->m_sb.sb_logblocks ||
                    libxfs_buf_read(mp->m_logdev_targp,

diff --git a/libxfs/libxfs_io.h b/libxfs/libxfs_io.h
index 9e65f4a63bfb0662e5d0f4b64f8ed191695b38b9..a3a3816cc2942f2949b8588da90f1d1c16c8a8b4 100644 (file)
--- a/libxfs/libxfs_io.h
+++ b/libxfs/libxfs_io.h
@@ -22,7 +22,7 @@ struct xfs_perag;
  */
 struct xfs_buftarg {
        struct xfs_mount        *bt_mount;
-       dev_t                   dev;
+       dev_t                   bt_bdev;
        unsigned int            flags;
 };
 
@@ -64,7 +64,6 @@ typedef struct xfs_buf {
        unsigned                b_bcount;
        unsigned int            b_length;
        struct xfs_buftarg      *b_target;
-#define b_dev          b_target->dev
        pthread_mutex_t         b_lock;
        pthread_t               b_holder;
        unsigned int            b_recur;

diff --git a/libxfs/logitem.c b/libxfs/logitem.c
index 40f9400f1903b4551c523eb1102cf8d78e9cf227..db5c961d2132d23b3db684f61ede6b630c042906 100644 (file)
--- a/libxfs/logitem.c
+++ b/libxfs/logitem.c
@@ -45,7 +45,7 @@ xfs_trans_buf_item_match(
        list_for_each_entry(lip, &tp->t_items, li_trans) {
                blip = (struct xfs_buf_log_item *)lip;
                if (blip->bli_item.li_type == XFS_LI_BUF &&
-                   blip->bli_buf->b_target->dev == btp->dev &&
+                   blip->bli_buf->b_target->bt_bdev == btp->bt_bdev &&
                    XFS_BUF_ADDR(blip->bli_buf) == map[0].bm_bn &&
                    blip->bli_buf->b_bcount == BBTOB(len)) {
                        ASSERT(blip->bli_buf->b_map_count == nmaps);

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 2247d6175184a1fb5b476c80a8a7de81c581591c..918f6025faf10224f9cd940641d08f5c71264fcb 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -68,7 +68,7 @@ libxfs_device_zero(struct xfs_buftarg *btp, xfs_daddr_t start, uint len)
        char            *z;
        int             error, fd;
 
-       fd = libxfs_device_to_fd(btp->dev);
+       fd = libxfs_device_to_fd(btp->bt_bdev);
        start_offset = LIBXFS_BBTOOFF64(start);
 
        /* try to use special zeroing methods, fall back to writes if needed */
@@ -201,7 +201,7 @@ libxfs_bcompare(struct cache_node *node, cache_key_t key)
                                                   b_node);
        struct xfs_bufkey       *bkey = (struct xfs_bufkey *)key;
 
-       if (bp->b_target->dev == bkey->buftarg->dev &&
+       if (bp->b_target->bt_bdev == bkey->buftarg->bt_bdev &&
            bp->b_bn == bkey->blkno) {
                if (bp->b_bcount == BBTOB(bkey->bblen))
                        return CACHE_HIT;
@@ -577,7 +577,7 @@ int
 libxfs_readbufr(struct xfs_buftarg *btp, xfs_daddr_t blkno, xfs_buf_t *bp,
                int len, int flags)
 {
-       int     fd = libxfs_device_to_fd(btp->dev);
+       int     fd = libxfs_device_to_fd(btp->bt_bdev);
        int     bytes = BBTOB(len);
        int     error;
 
@@ -585,7 +585,7 @@ libxfs_readbufr(struct xfs_buftarg *btp, xfs_daddr_t blkno, xfs_buf_t *bp,
 
        error = __read_buf(fd, bp->b_addr, bytes, LIBXFS_BBTOOFF64(blkno), flags);
        if (!error &&
-           bp->b_target->dev == btp->dev &&
+           bp->b_target->bt_bdev == btp->bt_bdev &&
            bp->b_bn == blkno &&
            bp->b_bcount == bytes)
                bp->b_flags |= LIBXFS_B_UPTODATE;
@@ -615,7 +615,7 @@ libxfs_readbufr_map(struct xfs_buftarg *btp, struct xfs_buf *bp, int flags)
        void    *buf;
        int     i;
 
-       fd = libxfs_device_to_fd(btp->dev);
+       fd = libxfs_device_to_fd(btp->bt_bdev);
        buf = bp->b_addr;
        for (i = 0; i < bp->b_nmaps; i++) {
                off64_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn);
@@ -799,7 +799,7 @@ int
 libxfs_bwrite(
        struct xfs_buf  *bp)
 {
-       int             fd = libxfs_device_to_fd(bp->b_target->dev);
+       int             fd = libxfs_device_to_fd(bp->b_target->bt_bdev);
 
        /*
         * we never write buffers that are marked stale. This indicates they
@@ -1131,11 +1131,11 @@ libxfs_blkdev_issue_flush(
 {
        int                     fd, ret;
 
-       if (btp->dev == 0)
+       if (btp->bt_bdev == 0)
                return 0;
 
-       fd = libxfs_device_to_fd(btp->dev);
-       ret = platform_flush_device(fd, btp->dev);
+       fd = libxfs_device_to_fd(btp->bt_bdev);
+       ret = platform_flush_device(fd, btp->bt_bdev);
        return ret ? -errno : 0;
 }
 
@@ -1212,7 +1212,7 @@ libxfs_log_clear(
        char                    *ptr;
 
        if (((btp && dptr) || (!btp && !dptr)) ||
-           (btp && !btp->dev) || !fs_uuid)
+           (btp && !btp->bt_bdev) || !fs_uuid)
                return -EINVAL;
 
        /* first zero the log */

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index b09c3a70517ab85d698e5caa981b25a8db09ae6f..47acc127c075a3115599c0d252226e70abe1158a 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -3583,7 +3583,7 @@ prepare_devices(
                         lsunit, XLOG_FMT, XLOG_INIT_CYCLE, false);
 
        /* finally, check we can write the last block in the realtime area */
-       if (mp->m_rtdev_targp->dev && cfg->rtblocks > 0) {
+       if (mp->m_rtdev_targp->bt_bdev && cfg->rtblocks > 0) {
                buf = alloc_write_buf(mp->m_rtdev_targp,
                                XFS_FSB_TO_BB(mp, cfg->rtblocks - 1LL),
                                BTOBB(cfg->blocksize));

diff --git a/repair/prefetch.c b/repair/prefetch.c
index 686bf7be5374ac5718b10958429da1ef5614eafe..88f85143f9fc3488e79c17c72e133c836342dc9e 100644 (file)
--- a/repair/prefetch.c
+++ b/repair/prefetch.c
@@ -869,7 +869,7 @@ init_prefetch(
        xfs_mount_t             *pmp)
 {
        mp = pmp;
-       mp_fd = libxfs_device_to_fd(mp->m_ddev_targp->dev);
+       mp_fd = libxfs_device_to_fd(mp->m_ddev_targp->bt_bdev);
        pf_max_bytes = sysconf(_SC_PAGE_SIZE) << 7;
        pf_max_bbs = pf_max_bytes >> BBSHIFT;
        pf_max_fsbs = pf_max_bytes >> mp->m_sb.sb_blocklog;