浏览代码

NFS: Create NFS_ACCESS_* flags

Passing the NFS v4 flags into the v3 code seems weird to me, even if
they are defined to the same values.  This patch adds in generic flags
to help me feel better

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Anna Schumaker 8 年之前
父节点
当前提交
3c1818275c
共有 2 个文件被更改,包括 18 次插入8 次删除
  1. 8 8
      fs/nfs/dir.c
  2. 10 0
      include/linux/nfs_fs.h

+ 8 - 8
fs/nfs/dir.c

@@ -2369,15 +2369,15 @@ void nfs_access_add_cache(struct inode *inode, struct nfs_access_entry *set)
 }
 }
 EXPORT_SYMBOL_GPL(nfs_access_add_cache);
 EXPORT_SYMBOL_GPL(nfs_access_add_cache);
 
 
-#define NFS_MAY_READ (NFS4_ACCESS_READ)
-#define NFS_MAY_WRITE (NFS4_ACCESS_MODIFY | \
-		NFS4_ACCESS_EXTEND | \
-		NFS4_ACCESS_DELETE)
-#define NFS_FILE_MAY_WRITE (NFS4_ACCESS_MODIFY | \
-		NFS4_ACCESS_EXTEND)
+#define NFS_MAY_READ (NFS_ACCESS_READ)
+#define NFS_MAY_WRITE (NFS_ACCESS_MODIFY | \
+		NFS_ACCESS_EXTEND | \
+		NFS_ACCESS_DELETE)
+#define NFS_FILE_MAY_WRITE (NFS_ACCESS_MODIFY | \
+		NFS_ACCESS_EXTEND)
 #define NFS_DIR_MAY_WRITE NFS_MAY_WRITE
 #define NFS_DIR_MAY_WRITE NFS_MAY_WRITE
-#define NFS_MAY_LOOKUP (NFS4_ACCESS_LOOKUP)
-#define NFS_MAY_EXECUTE (NFS4_ACCESS_EXECUTE)
+#define NFS_MAY_LOOKUP (NFS_ACCESS_LOOKUP)
+#define NFS_MAY_EXECUTE (NFS_ACCESS_EXECUTE)
 static int
 static int
 nfs_access_calc_mask(u32 access_result, umode_t umode)
 nfs_access_calc_mask(u32 access_result, umode_t umode)
 {
 {

+ 10 - 0
include/linux/nfs_fs.h

@@ -183,6 +183,16 @@ struct nfs_inode {
 	struct inode		vfs_inode;
 	struct inode		vfs_inode;
 };
 };
 
 
+/*
+ * Access bit flags
+ */
+#define NFS_ACCESS_READ        0x0001
+#define NFS_ACCESS_LOOKUP      0x0002
+#define NFS_ACCESS_MODIFY      0x0004
+#define NFS_ACCESS_EXTEND      0x0008
+#define NFS_ACCESS_DELETE      0x0010
+#define NFS_ACCESS_EXECUTE     0x0020
+
 /*
 /*
  * Cache validity bit flags
  * Cache validity bit flags
  */
  */