Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c181827 authored by Anna Schumaker's avatar Anna Schumaker
Browse files

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: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 33d930e5

fs/nfs/dir.c

+8 −8
Original line number Diff line number Diff line
@@ -2369,15 +2369,15 @@ void nfs_access_add_cache(struct inode *inode, struct nfs_access_entry *set) 
}

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_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

nfs_access_calc_mask(u32 access_result, umode_t umode)

{

include/linux/nfs_fs.h

+10 −0
Original line number Diff line number Diff line
@@ -183,6 +183,16 @@ struct nfs_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

 */