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

Diff for /xfs-linux/linux-2.6/xfs_file.c between versions 1.146 and 1.147

version 1.146, 2006/11/30 14:40:05 version 1.147, 2006/12/12 02:57:21
Line 42 Line 42
 #include <linux/smp_lock.h>  #include <linux/smp_lock.h>
   
 static struct vm_operations_struct xfs_file_vm_ops;  static struct vm_operations_struct xfs_file_vm_ops;
 #ifdef CONFIG_XFS_DMAPI  #ifdef HAVE_DMAPI
 static struct vm_operations_struct xfs_dmapi_file_vm_ops;  static struct vm_operations_struct xfs_dmapi_file_vm_ops;
 #endif  #endif
   
Line 244  xfs_file_fsync( Line 244  xfs_file_fsync(
         return -bhv_vop_fsync(vp, flags, NULL, (xfs_off_t)0, (xfs_off_t)-1);          return -bhv_vop_fsync(vp, flags, NULL, (xfs_off_t)0, (xfs_off_t)-1);
 }  }
   
 #ifdef CONFIG_XFS_DMAPI  #ifdef HAVE_DMAPI
 STATIC struct page *  STATIC struct page *
 xfs_vm_nopage(  xfs_vm_nopage(
         struct vm_area_struct   *area,          struct vm_area_struct   *area,
Line 259  xfs_vm_nopage( Line 259  xfs_vm_nopage(
                 return NULL;                  return NULL;
         return filemap_nopage(area, address, type);          return filemap_nopage(area, address, type);
 }  }
 #endif /* CONFIG_XFS_DMAPI */  #endif /* HAVE_DMAPI */
   
 STATIC int  STATIC int
 xfs_file_readdir(  xfs_file_readdir(
Line 344  xfs_file_mmap( Line 344  xfs_file_mmap(
 {  {
         vma->vm_ops = &xfs_file_vm_ops;          vma->vm_ops = &xfs_file_vm_ops;
   
 #ifdef CONFIG_XFS_DMAPI  #ifdef HAVE_DMAPI
         if (vn_from_inode(filp->f_dentry->d_inode)->v_vfsp->vfs_flag & VFS_DMI)          if (vn_from_inode(filp->f_dentry->d_inode)->v_vfsp->vfs_flag & VFS_DMI)
                 vma->vm_ops = &xfs_dmapi_file_vm_ops;                  vma->vm_ops = &xfs_dmapi_file_vm_ops;
 #endif /* CONFIG_XFS_DMAPI */  #endif /* HAVE_DMAPI */
   
         file_accessed(filp);          file_accessed(filp);
         return 0;          return 0;
Line 397  xfs_file_ioctl_invis( Line 397  xfs_file_ioctl_invis(
         return error;          return error;
 }  }
   
 #ifdef CONFIG_XFS_DMAPI  #ifdef HAVE_DMAPI
 #ifdef HAVE_VMOP_MPROTECT  #ifdef HAVE_VMOP_MPROTECT
 STATIC int  STATIC int
 xfs_vm_mprotect(  xfs_vm_mprotect(
Line 418  xfs_vm_mprotect( Line 418  xfs_vm_mprotect(
         return error;          return error;
 }  }
 #endif /* HAVE_VMOP_MPROTECT */  #endif /* HAVE_VMOP_MPROTECT */
 #endif /* CONFIG_XFS_DMAPI */  #endif /* HAVE_DMAPI */
   
 #ifdef HAVE_FOP_OPEN_EXEC  #ifdef HAVE_FOP_OPEN_EXEC
 /* If the user is attempting to execute a file that is offline then  /* If the user is attempting to execute a file that is offline then
Line 505  static struct vm_operations_struct xfs_f Line 505  static struct vm_operations_struct xfs_f
         .populate       = filemap_populate,          .populate       = filemap_populate,
 };  };
   
 #ifdef CONFIG_XFS_DMAPI  #ifdef HAVE_DMAPI
 static struct vm_operations_struct xfs_dmapi_file_vm_ops = {  static struct vm_operations_struct xfs_dmapi_file_vm_ops = {
         .nopage         = xfs_vm_nopage,          .nopage         = xfs_vm_nopage,
         .populate       = filemap_populate,          .populate       = filemap_populate,
Line 513  static struct vm_operations_struct xfs_d Line 513  static struct vm_operations_struct xfs_d
         .mprotect       = xfs_vm_mprotect,          .mprotect       = xfs_vm_mprotect,
 #endif  #endif
 };  };
 #endif /* CONFIG_XFS_DMAPI */  #endif /* HAVE_DMAPI */
Removed from v.1.146  
changed lines
  Added in v.1.147

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