[BACK]Return to xfs_aops.c CVS log [TXT] [DIR] Up to [OSS] / xfs-linux / linux-2.6

Diff for /xfs-linux/linux-2.6/xfs_aops.c between versions 1.153 and 1.154

version 1.153, 2007/09/13 04:08:08 version 1.154, 2007/09/13 06:10:29
Line 107  xfs_page_trace( Line 107  xfs_page_trace(
 #define xfs_page_trace(tag, inode, page, pgoff)  #define xfs_page_trace(tag, inode, page, pgoff)
 #endif  #endif
   
   STATIC struct block_device *
   xfs_find_bdev_for_inode(
           struct xfs_inode        *ip)
   {
           struct xfs_mount        *mp = ip->i_mount;
   
           if (ip->i_d.di_flags & XFS_DIFLAG_REALTIME)
                   return mp->m_rtdev_targp->bt_bdev;
           else
                   return mp->m_ddev_targp->bt_bdev;
   }
   
 /*  /*
  * Schedule IO completion handling on a xfsdatad if this was   * Schedule IO completion handling on a xfsdatad if this was
  * the final hold on this ioend. If we are asked to wait,   * the final hold on this ioend. If we are asked to wait,
Line 1477  xfs_vm_direct_IO( Line 1489  xfs_vm_direct_IO(
 {  {
         struct file     *file = iocb->ki_filp;          struct file     *file = iocb->ki_filp;
         struct inode    *inode = file->f_mapping->host;          struct inode    *inode = file->f_mapping->host;
         xfs_iomap_t     iomap;          struct block_device *bdev;
         int             maps = 1;  
         int             error;  
         ssize_t         ret;          ssize_t         ret;
   
         error = xfs_bmap(XFS_I(inode), offset, 0,          bdev = xfs_find_bdev_for_inode(XFS_I(inode));
                                 BMAPI_DEVICE, &iomap, &maps);  
         if (error)  
                 return -error;  
   
         if (rw == WRITE) {          if (rw == WRITE) {
                 iocb->private = xfs_alloc_ioend(inode, IOMAP_UNWRITTEN);                  iocb->private = xfs_alloc_ioend(inode, IOMAP_UNWRITTEN);
                 ret = blockdev_direct_IO_own_locking(rw, iocb, inode,                  ret = blockdev_direct_IO_own_locking(rw, iocb, inode,
                         iomap.iomap_target->bt_bdev,                          bdev, iov, offset, nr_segs,
                         iov, offset, nr_segs,  
                         xfs_get_blocks_direct,                          xfs_get_blocks_direct,
                         xfs_end_io_direct);                          xfs_end_io_direct);
         } else {          } else {
                 iocb->private = xfs_alloc_ioend(inode, IOMAP_READ);                  iocb->private = xfs_alloc_ioend(inode, IOMAP_READ);
                 ret = blockdev_direct_IO_no_locking(rw, iocb, inode,                  ret = blockdev_direct_IO_no_locking(rw, iocb, inode,
                         iomap.iomap_target->bt_bdev,                          bdev, iov, offset, nr_segs,
                         iov, offset, nr_segs,  
                         xfs_get_blocks_direct,                          xfs_get_blocks_direct,
                         xfs_end_io_direct);                          xfs_end_io_direct);
         }          }
Removed from v.1.153  
changed lines
  Added in v.1.154

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>