diff --git a/[refs] b/[refs]
index 36bace844436..bcf614562a24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee2a4f7caa4a72cdf2329081a1f7eb9939df3aab
+refs/heads/master: 0d14824c0774d050cb4232e1e470e5fc9e32e587
diff --git a/trunk/fs/xfs/linux-2.6/xfs_ioctl.c b/trunk/fs/xfs/linux-2.6/xfs_ioctl.c
index 71eabf4bf397..2b385394f28c 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_ioctl.c
+++ b/trunk/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);