Commit cb8c20fa authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust
Browse files

NFS: Move NFS v3 acl functions to nfs3_fs.h 



This code is internal to the v3 module, so other parts of the client
shouldn't have any knowledge of it.

nfs3_getxattr(), nfs3_setxattr(), and nfs3_removexattr() no longer exist
anywhere so I remove the declarations while I'm here.

Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent f08460dc

fs/nfs/nfs3_fs.h

+19 −0
Original line number Diff line number Diff line
@@ -6,6 +6,25 @@ 
#ifndef __LINUX_FS_NFS_NFS3_FS_H

#define __LINUX_FS_NFS_NFS3_FS_H



/*

 * nfs3acl.c

 */

#ifdef CONFIG_NFS_V3_ACL

extern struct posix_acl *nfs3_get_acl(struct inode *inode, int type);

extern int nfs3_set_acl(struct inode *inode, struct posix_acl *acl, int type);

extern int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl,

		struct posix_acl *dfacl);

extern ssize_t nfs3_listxattr(struct dentry *, char *, size_t);

extern const struct xattr_handler *nfs3_xattr_handlers[];

#else

static inline int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl,

		struct posix_acl *dfacl)

{

	return 0;

}

#define nfs3_listxattr NULL

#endif /* CONFIG_NFS_V3_ACL */



/* nfs3client.c */

struct nfs_server *nfs3_create_server(struct nfs_mount_info *, struct nfs_subversion *);

struct nfs_server *nfs3_clone_server(struct nfs_server *, struct nfs_fh *,

fs/nfs/nfs3super.c

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/module.h>

#include <linux/nfs_fs.h>

#include "internal.h"

#include "nfs3_fs.h"

#include "nfs.h"



static struct nfs_subversion nfs_v3 = {

include/linux/nfs_fs.h

+0 −33
Original line number Diff line number Diff line
@@ -442,22 +442,6 @@ static inline struct rpc_cred *nfs_file_cred(struct file *file) 
	return NULL;

}



/*

 * linux/fs/nfs/xattr.c

 */

#ifdef CONFIG_NFS_V3_ACL

extern ssize_t nfs3_listxattr(struct dentry *, char *, size_t);

extern ssize_t nfs3_getxattr(struct dentry *, const char *, void *, size_t);

extern int nfs3_setxattr(struct dentry *, const char *,

			const void *, size_t, int);

extern int nfs3_removexattr (struct dentry *, const char *name);

#else

# define nfs3_listxattr NULL

# define nfs3_getxattr NULL

# define nfs3_setxattr NULL

# define nfs3_removexattr NULL

#endif



/*

 * linux/fs/nfs/direct.c

 */
@@ -548,23 +532,6 @@ extern int nfs_readpages(struct file *, struct address_space *, 
extern int  nfs_readpage_async(struct nfs_open_context *, struct inode *,

			       struct page *);



/*

 * linux/fs/nfs3proc.c

 */

#ifdef CONFIG_NFS_V3_ACL

extern struct posix_acl *nfs3_get_acl(struct inode *inode, int type);

extern int nfs3_set_acl(struct inode *inode, struct posix_acl *acl, int type);

extern int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl,

		struct posix_acl *dfacl);

extern const struct xattr_handler *nfs3_xattr_handlers[];

#else

static inline int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl,

		struct posix_acl *dfacl)

{

	return 0;

}

#endif /* CONFIG_NFS_V3_ACL */



/*

 * inline functions

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE