summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2006-01-11 15:33:51 +1100
committerNathan Scott <nathans@sgi.com>2006-01-11 15:33:51 +1100
commit0d14824c0774d050cb4232e1e470e5fc9e32e587 (patch)
tree5bb89912861e406b87a19bd0bface95fd0e7df69
parentee2a4f7caa4a72cdf2329081a1f7eb9939df3aab (diff)
downloadop-kernel-dev-0d14824c0774d050cb4232e1e470e5fc9e32e587.zip
op-kernel-dev-0d14824c0774d050cb4232e1e470e5fc9e32e587.tar.gz
[XFS] Ensure max diosize reported is aligned with minimum diosize.
SGI-PV: 910890 SGI-Modid: xfs-linux-melb:xfs-kern:24689a Signed-off-by: Nathan Scott <nathans@sgi.com>
-rw-r--r--fs/xfs/linux-2.6/xfs_ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c
index 71eabf4..2b38539 100644
--- a/fs/xfs/linux-2.6/xfs_ioctl.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl.c
@@ -751,7 +751,7 @@ xfs_ioctl(
mp->m_rtdev_targp : mp->m_ddev_targp;
da.d_mem = da.d_miniosz = 1 << target->pbr_sshift;
- da.d_maxiosz = INT_MAX;
+ da.d_maxiosz = INT_MAX & ~(da.d_miniosz - 1);
if (copy_to_user(arg, &da, sizeof(da)))
return -XFS_ERROR(EFAULT);
OpenPOWER on IntegriCloud