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

Diff for /xfs-linux/linux-2.4/Attic/xfs_file.c between versions 1.129 and 1.130

version 1.129, 2006/11/30 14:40:05 version 1.130, 2006/12/12 02:57:21
Line 43 Line 43
 #include <linux/mman.h> /* for PROT_WRITE */  #include <linux/mman.h> /* for PROT_WRITE */
   
 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 296  done: Line 296  done:
         return -error;          return -error;
 }  }
   
 #ifdef CONFIG_XFS_DMAPI  #ifdef HAVE_DMAPI
   
 STATIC struct page *  STATIC struct page *
 xfs_vm_nopage(  xfs_vm_nopage(
Line 313  xfs_vm_nopage( Line 313  xfs_vm_nopage(
         return filemap_nopage(area, address, unused);          return filemap_nopage(area, address, unused);
 }  }
   
 #endif /* CONFIG_XFS_DMAPI */  #endif /* HAVE_DMAPI */
   
   
 STATIC int  STATIC int
Line 325  xfs_file_mmap( Line 325  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(ip)->v_vfsp->vfs_flag & VFS_DMI)          if (vn_from_inode(ip)->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 */
   
         UPDATE_ATIME(ip);          UPDATE_ATIME(ip);
         return 0;          return 0;
Line 383  xfs_file_ioctl_invis( Line 383  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 404  xfs_vm_mprotect( Line 404  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
Line 472  static struct vm_operations_struct xfs_f Line 472  static struct vm_operations_struct xfs_f
         .nopage         = filemap_nopage,          .nopage         = filemap_nopage,
 };  };
   
 #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,
 #ifdef HAVE_VMOP_MPROTECT  #ifdef HAVE_VMOP_MPROTECT
         .mprotect       = xfs_vm_mprotect,          .mprotect       = xfs_vm_mprotect,
 #endif  #endif
 };  };
 #endif /* CONFIG_XFS_DMAPI */  #endif /* HAVE_DMAPI */
Removed from v.1.129  
changed lines
  Added in v.1.130

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