4 files changed, 9 insertions, 9 deletions

diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index b664bce57bfc..a526f8d2dc6f 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -445,8 +445,8 @@ _xfs_buf_find(
         numbytes = BBTOB(numblks);
 
         /* Check for IOs smaller than the sector size / not sector aligned */
-        ASSERT(!(numbytes < btp->bt_ssize));
-        ASSERT(!(BBTOB(blkno) & (xfs_off_t)btp->bt_smask));
+        ASSERT(!(numbytes < btp->bt_meta_sectorsize));
+        ASSERT(!(BBTOB(blkno) & (xfs_off_t)btp->bt_meta_sectormask));
 
         /*
          * Corrupted block numbers can get through to here, unfortunately, so we
@@ -1599,8 +1599,8 @@ xfs_setsize_buftarg(
         unsigned int            blocksize,
         unsigned int            sectorsize)
 {
-        btp->bt_ssize = sectorsize;
-        btp->bt_smask = sectorsize - 1;
+        btp->bt_meta_sectorsize = sectorsize;
+        btp->bt_meta_sectormask = sectorsize - 1;
 
         if (set_blocksize(btp->bt_bdev, sectorsize)) {
                 char name[BDEVNAME_SIZE];
diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h
index 4ef949aebb04..d5d88dda4d31 100644
--- a/fs/xfs/xfs_buf.h
+++ b/fs/xfs/xfs_buf.h
@@ -93,8 +93,8 @@ typedef struct xfs_buftarg {
         struct block_device     *bt_bdev;
         struct backing_dev_info *bt_bdi;
         struct xfs_mount        *bt_mount;
-        unsigned int            bt_ssize;
-        size_t                  bt_smask;
+        unsigned int            bt_meta_sectorsize;
+        size_t                  bt_meta_sectormask;
 
         /* LRU control structures */
         struct shrinker         bt_shrinker;
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index e00121592632..d01745f748ac 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -261,7 +261,7 @@ xfs_file_aio_read(
                 xfs_buftarg_t   *target =
                         XFS_IS_REALTIME_INODE(ip) ?
                                 mp->m_rtdev_targp : mp->m_ddev_targp;
-                if ((pos & target->bt_smask) || (size & target->bt_smask)) {
+                if ((pos | size) & target->bt_meta_sectormask) {
                         if (pos == i_size_read(inode))
                                 return 0;
                         return -XFS_ERROR(EINVAL);
@@ -641,7 +641,7 @@ xfs_file_dio_aio_write(
         struct xfs_buftarg      *target = XFS_IS_REALTIME_INODE(ip) ?
                                         mp->m_rtdev_targp : mp->m_ddev_targp;
 
-        if ((pos & target->bt_smask) || (count & target->bt_smask))
+        if ((pos | count) & target->bt_meta_sectormask)
                 return -XFS_ERROR(EINVAL);
 
         if ((pos & mp->m_blockmask) || ((pos + count) & mp->m_blockmask))
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 584e092415d0..3dc60ed9572a 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -1583,7 +1583,7 @@ xfs_file_ioctl(
                         XFS_IS_REALTIME_INODE(ip) ?
                         mp->m_rtdev_targp : mp->m_ddev_targp;
 
-                da.d_mem = da.d_miniosz = target->bt_ssize;
+                da.d_mem = da.d_miniosz = target->bt_meta_sectorsize;
                 da.d_maxiosz = INT_MAX & ~(da.d_miniosz - 1);
 
                 if (copy_to_user(arg, &da, sizeof(da)))