On 01/17/2014 03:23 PM, Eric Sandeen wrote:
> Clean up the xfs_buftarg structure a bit:
> - remove bt_bsize, which is never used
> - replace bt_sshift with bt_ssize; we only ever shift it back
> to a size anyway
>
> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
>
> diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
> index 9fccfb5..b664bce 100644
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@ -445,7 +445,7 @@ _xfs_buf_find(
> numbytes = BBTOB(numblks);
>
> /* Check for IOs smaller than the sector size / not sector aligned */
> - ASSERT(!(numbytes < (1 << btp->bt_sshift)));
> + ASSERT(!(numbytes < btp->bt_ssize));
> ASSERT(!(BBTOB(blkno) & (xfs_off_t)btp->bt_smask));
>
> /*
> @@ -1599,8 +1599,7 @@ xfs_setsize_buftarg(
> unsigned int blocksize,
> unsigned int sectorsize)
> {
> - btp->bt_bsize = blocksize;
> - btp->bt_sshift = ffs(sectorsize) - 1;
> + btp->bt_ssize = sectorsize;
> btp->bt_smask = sectorsize - 1;
>
> if (set_blocksize(btp->bt_bdev, sectorsize)) {
> diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h
> index 1cf21a4..4ef949a 100644
> --- a/fs/xfs/xfs_buf.h
> +++ b/fs/xfs/xfs_buf.h
> @@ -93,8 +93,7 @@ typedef struct xfs_buftarg {
> struct block_device *bt_bdev;
> struct backing_dev_info *bt_bdi;
> struct xfs_mount *bt_mount;
> - unsigned int bt_bsize;
> - unsigned int bt_sshift;
> + unsigned int bt_ssize;
> size_t bt_smask;
>
> /* LRU control structures */
> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
> index 33ad9a7..39c38ee 100644
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@ -1587,7 +1587,7 @@ xfs_file_ioctl(
> XFS_IS_REALTIME_INODE(ip) ?
> mp->m_rtdev_targp : mp->m_ddev_targp;
>
> - da.d_mem = da.d_miniosz = 1 << target->bt_sshift;
> + da.d_mem = da.d_miniosz = target->bt_ssize;
> da.d_maxiosz = INT_MAX & ~(da.d_miniosz - 1);
>
> if (copy_to_user(arg, &da, sizeof(da)))
>
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs
>
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
