diff options
| author | Eric Sandeen <sandeen@sandeen.net> | 2014-01-21 16:45:52 -0600 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2014-01-24 11:52:12 -0600 |
| commit | 6da54179b3f1bb6a302fd5f3b38fae32ee463ed1 (patch) | |
| tree | 8dd71c82c827efe171acf9835e5dfda229c09ca9 /fs/xfs/xfs_file.c | |
| parent | f0bc9985fe8bf4377d5557cd7957d9be43ec8861 (diff) | |
| download | lwn-6da54179b3f1bb6a302fd5f3b38fae32ee463ed1.tar.gz lwn-6da54179b3f1bb6a302fd5f3b38fae32ee463ed1.zip | |
xfs: rename xfs_buftarg structure members
In preparation for adding new members to the structure,
give these old ones more descriptive names:
bt_ssize -> bt_meta_sectorsize
bt_smask -> bt_meta_sectormask
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_file.c')
| -rw-r--r-- | fs/xfs/xfs_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
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)) |