diff options
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_lrw.c')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_lrw.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c index 147a28861f6b..e0ab45fbfebd 100644 --- a/fs/xfs/linux-2.6/xfs_lrw.c +++ b/fs/xfs/linux-2.6/xfs_lrw.c | |||
@@ -233,8 +233,8 @@ xfs_read( | |||
233 | xfs_buftarg_t *target = | 233 | xfs_buftarg_t *target = |
234 | (ip->i_d.di_flags & XFS_DIFLAG_REALTIME) ? | 234 | (ip->i_d.di_flags & XFS_DIFLAG_REALTIME) ? |
235 | mp->m_rtdev_targp : mp->m_ddev_targp; | 235 | mp->m_rtdev_targp : mp->m_ddev_targp; |
236 | if ((*offset & target->pbr_smask) || | 236 | if ((*offset & target->bt_smask) || |
237 | (size & target->pbr_smask)) { | 237 | (size & target->bt_smask)) { |
238 | if (*offset == ip->i_d.di_size) { | 238 | if (*offset == ip->i_d.di_size) { |
239 | return (0); | 239 | return (0); |
240 | } | 240 | } |
@@ -618,7 +618,7 @@ xfs_write( | |||
618 | (xip->i_d.di_flags & XFS_DIFLAG_REALTIME) ? | 618 | (xip->i_d.di_flags & XFS_DIFLAG_REALTIME) ? |
619 | mp->m_rtdev_targp : mp->m_ddev_targp; | 619 | mp->m_rtdev_targp : mp->m_ddev_targp; |
620 | 620 | ||
621 | if ((pos & target->pbr_smask) || (count & target->pbr_smask)) | 621 | if ((pos & target->bt_smask) || (count & target->bt_smask)) |
622 | return XFS_ERROR(-EINVAL); | 622 | return XFS_ERROR(-EINVAL); |
623 | 623 | ||
624 | if (!VN_CACHED(vp) && pos < i_size_read(inode)) | 624 | if (!VN_CACHED(vp) && pos < i_size_read(inode)) |
@@ -938,7 +938,7 @@ xfs_bdstrat_cb(struct xfs_buf *bp) | |||
938 | 938 | ||
939 | mp = XFS_BUF_FSPRIVATE3(bp, xfs_mount_t *); | 939 | mp = XFS_BUF_FSPRIVATE3(bp, xfs_mount_t *); |
940 | if (!XFS_FORCED_SHUTDOWN(mp)) { | 940 | if (!XFS_FORCED_SHUTDOWN(mp)) { |
941 | pagebuf_iorequest(bp); | 941 | xfs_buf_iorequest(bp); |
942 | return 0; | 942 | return 0; |
943 | } else { | 943 | } else { |
944 | xfs_buftrace("XFS__BDSTRAT IOERROR", bp); | 944 | xfs_buftrace("XFS__BDSTRAT IOERROR", bp); |
@@ -991,7 +991,7 @@ xfsbdstrat( | |||
991 | * if (XFS_BUF_IS_GRIO(bp)) { | 991 | * if (XFS_BUF_IS_GRIO(bp)) { |
992 | */ | 992 | */ |
993 | 993 | ||
994 | pagebuf_iorequest(bp); | 994 | xfs_buf_iorequest(bp); |
995 | return 0; | 995 | return 0; |
996 | } | 996 | } |
997 | 997 | ||