1 files changed, 3 insertions, 7 deletions

diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c
index 21667ba6dcd5..4db47790415c 100644
--- a/fs/xfs/linux-2.6/xfs_ioctl.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl.c
@@ -146,13 +146,10 @@ xfs_find_handle(
 
         if (cmd != XFS_IOC_PATH_TO_FSHANDLE) {
                 xfs_inode_t     *ip;
-                bhv_desc_t      *bhv;
                 int             lock_mode;
 
                 /* need to get access to the xfs_inode to read the generation */
-                bhv = vn_bhv_lookup_unlocked(VN_BHV_HEAD(vp), &xfs_vnodeops);
-                ASSERT(bhv);
-                ip = XFS_BHVTOI(bhv);
+                ip = xfs_vtoi(vp);
                 ASSERT(ip);
                 lock_mode = xfs_ilock_map_shared(ip);
 
@@ -751,9 +748,8 @@ xfs_ioctl(
                         (ip->i_d.di_flags & XFS_DIFLAG_REALTIME) ?
                         mp->m_rtdev_targp : mp->m_ddev_targp;
 
-                da.d_mem = da.d_miniosz = 1 << target->pbr_sshift;
-                /* The size dio will do in one go */
-                da.d_maxiosz = 64 * PAGE_CACHE_SIZE;
+                da.d_mem = da.d_miniosz = 1 << target->bt_sshift;
+                da.d_maxiosz = INT_MAX & ~(da.d_miniosz - 1);
 
                 if (copy_to_user(arg, &da, sizeof(da)))
                         return -XFS_ERROR(EFAULT);