From: Nathan Scott <nathans@sgi.com>
Date: Wed, 11 Jan 2006 04:33:51 +0000 (+1100)
Subject: [XFS] Ensure max diosize reported is aligned with minimum diosize.
X-Git-Tag: v2.6.16-rc1~185^2~33
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d14824c0774d050cb4232e1e470e5fc9e32e587;p=linux-2.6

[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>
---

diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c
index 71eabf4bf3..2b385394f2 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);