block, drivers, fs: shrink bi_rw from long to int

We don't need bi_rw to be so large on 64 bit archs, so
reduce it to unsigned int.

Signed-off-by: Mike Christie <mchristi@redhat.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
index 80a43893f492..da944ffddbaf 100644
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@ -2943,7 +2943,7 @@ static void __btrfsic_submit_bio(struct bio *bio)
                 if (dev_state->state->print_mask &
                     BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH)
                         printk(KERN_INFO
-                               "submit_bio(rw=%d,0x%lx, bi_vcnt=%u,"
+                               "submit_bio(rw=%d,0x%x, bi_vcnt=%u,"
                                " bi_sector=%llu (bytenr %llu), bi_bdev=%p)\n",
                                bio_op(bio), bio->bi_rw, bio->bi_vcnt,
                                (unsigned long long)bio->bi_iter.bi_sector,
@@ -2986,7 +2986,7 @@ static void __btrfsic_submit_bio(struct bio *bio)
                 if (dev_state->state->print_mask &
                     BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH)
                         printk(KERN_INFO
-                               "submit_bio(rw=%d,0x%lx FLUSH, bdev=%p)\n",
+                               "submit_bio(rw=%d,0x%x FLUSH, bdev=%p)\n",
                                bio_op(bio), bio->bi_rw, bio->bi_bdev);
                 if (!dev_state->dummy_block_for_bio_bh_flush.is_iodone) {
                         if ((dev_state->state->print_mask &
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index ec61db64c4c9..1323e4faa44c 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8184,7 +8184,7 @@ static void btrfs_end_dio_bio(struct bio *bio)
 
         if (err)
                 btrfs_warn(BTRFS_I(dip->inode)->root->fs_info,
-                           "direct IO failed ino %llu rw %d,%lu sector %#Lx len %u err no %d",
+                           "direct IO failed ino %llu rw %d,%u sector %#Lx len %u err no %d",
                            btrfs_ino(dip->inode), bio_op(bio), bio->bi_rw,
                            (unsigned long long)bio->bi_iter.bi_sector,
                            bio->bi_iter.bi_size, err);