aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/linux-2.6/xfs_aops.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_aops.c')
-rw-r--r--fs/xfs/linux-2.6/xfs_aops.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
index 2b610c7ba322..448912f0e753 100644
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
@@ -76,7 +76,7 @@ xfs_page_trace(
76 int mask) 76 int mask)
77{ 77{
78 xfs_inode_t *ip; 78 xfs_inode_t *ip;
79 vnode_t *vp = LINVFS_GET_VP(inode); 79 vnode_t *vp = vn_from_inode(inode);
80 loff_t isize = i_size_read(inode); 80 loff_t isize = i_size_read(inode);
81 loff_t offset = page_offset(page); 81 loff_t offset = page_offset(page);
82 int delalloc = -1, unmapped = -1, unwritten = -1; 82 int delalloc = -1, unmapped = -1, unwritten = -1;
@@ -214,7 +214,7 @@ xfs_alloc_ioend(
214 ioend->io_uptodate = 1; /* cleared if any I/O fails */ 214 ioend->io_uptodate = 1; /* cleared if any I/O fails */
215 ioend->io_list = NULL; 215 ioend->io_list = NULL;
216 ioend->io_type = type; 216 ioend->io_type = type;
217 ioend->io_vnode = LINVFS_GET_VP(inode); 217 ioend->io_vnode = vn_from_inode(inode);
218 ioend->io_buffer_head = NULL; 218 ioend->io_buffer_head = NULL;
219 ioend->io_buffer_tail = NULL; 219 ioend->io_buffer_tail = NULL;
220 atomic_inc(&ioend->io_vnode->v_iocount); 220 atomic_inc(&ioend->io_vnode->v_iocount);
@@ -239,7 +239,7 @@ xfs_map_blocks(
239 xfs_iomap_t *mapp, 239 xfs_iomap_t *mapp,
240 int flags) 240 int flags)
241{ 241{
242 vnode_t *vp = LINVFS_GET_VP(inode); 242 vnode_t *vp = vn_from_inode(inode);
243 int error, nmaps = 1; 243 int error, nmaps = 1;
244 244
245 VOP_BMAP(vp, offset, count, flags, mapp, &nmaps, error); 245 VOP_BMAP(vp, offset, count, flags, mapp, &nmaps, error);
@@ -1229,7 +1229,7 @@ __xfs_get_block(
1229 int direct, 1229 int direct,
1230 bmapi_flags_t flags) 1230 bmapi_flags_t flags)
1231{ 1231{
1232 vnode_t *vp = LINVFS_GET_VP(inode); 1232 vnode_t *vp = vn_from_inode(inode);
1233 xfs_iomap_t iomap; 1233 xfs_iomap_t iomap;
1234 xfs_off_t offset; 1234 xfs_off_t offset;
1235 ssize_t size; 1235 ssize_t size;
@@ -1371,7 +1371,7 @@ xfs_vm_direct_IO(
1371{ 1371{
1372 struct file *file = iocb->ki_filp; 1372 struct file *file = iocb->ki_filp;
1373 struct inode *inode = file->f_mapping->host; 1373 struct inode *inode = file->f_mapping->host;
1374 vnode_t *vp = LINVFS_GET_VP(inode); 1374 vnode_t *vp = vn_from_inode(inode);
1375 xfs_iomap_t iomap; 1375 xfs_iomap_t iomap;
1376 int maps = 1; 1376 int maps = 1;
1377 int error; 1377 int error;
@@ -1410,7 +1410,7 @@ xfs_vm_bmap(
1410 sector_t block) 1410 sector_t block)
1411{ 1411{
1412 struct inode *inode = (struct inode *)mapping->host; 1412 struct inode *inode = (struct inode *)mapping->host;
1413 vnode_t *vp = LINVFS_GET_VP(inode); 1413 vnode_t *vp = vn_from_inode(inode);
1414 int error; 1414 int error;
1415 1415
1416 vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address); 1416 vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);