redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Eric Sandeen 2014-01-21 16:45:52 -06:00 committed by Ben Myers
parent f0bc9985fe
commit 6da54179b3
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/xfs/xfs_buf.c
View File

@ -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];

4
fs/xfs/xfs_buf.h
View File

@ -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;

4
fs/xfs/xfs_file.c
View File

@ -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))

2
fs/xfs/xfs_ioctl.c
View File

@ -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)))