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

Commit b7fa0554 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Trond Myklebust
Browse files

[PATCH] NFS: Add support for NFSv3 ACLs 



 This adds acl support fo nfs clients via the NFSACL protocol extension, by
 implementing the getxattr, listxattr, setxattr, and removexattr iops for the
 system.posix_acl_access and system.posix_acl_default attributes.  This patch
 implements a dumb version that uses no caching (and thus adds some overhead).
 (Another patch in this patchset adds caching as well.)

 Signed-off-by: default avatarAndreas Gruenbacher <agruen@suse.de>
 Acked-by: default avatarOlaf Kirch <okir@suse.de>
 Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
 Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent a257cdd0

fs/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -1268,6 +1268,7 @@ config NFS_FS 
	depends on INET

	select LOCKD

	select SUNRPC

	select NFS_ACL_SUPPORT if NFS_V3_ACL

	help

	  If you are connected to some other (usually local) Unix computer

	  (using SLIP, PLIP, PPP or Ethernet) and want to mount files residing
@@ -1310,6 +1311,16 @@ config NFS_V3 


	  If unsure, say Y.



config NFS_V3_ACL

	bool "Provide client support for the NFSv3 ACL protocol extension"

	depends on NFS_V3

	help

	  Implement the NFSv3 ACL protocol extension for manipulating POSIX

	  Access Control Lists.  The server should also be compiled with

	  the NFSv3 ACL protocol extension; see the CONFIG_NFSD_V3_ACL option.



	  If unsure, say N.



config NFS_V4

	bool "Provide NFSv4 client support (EXPERIMENTAL)"

	depends on NFS_FS && EXPERIMENTAL

fs/nfs/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ nfs-y := dir.o file.o inode.o nfs2xdr.o pagelist.o \ 
			   proc.o read.o symlink.o unlink.o write.o

nfs-$(CONFIG_ROOT_NFS)	+= nfsroot.o mount_clnt.o      

nfs-$(CONFIG_NFS_V3)	+= nfs3proc.o nfs3xdr.o

nfs-$(CONFIG_NFS_V3_ACL)	+= nfs3acl.o

nfs-$(CONFIG_NFS_V4)	+= nfs4proc.o nfs4xdr.o nfs4state.o nfs4renewd.o \

			   delegation.o idmap.o \

			   callback.o callback_xdr.o callback_proc.o

fs/nfs/dir.c

+21 −0
Original line number Diff line number Diff line
@@ -75,6 +75,27 @@ struct inode_operations nfs_dir_inode_operations = { 
	.setattr	= nfs_setattr,

};



#ifdef CONFIG_NFS_V3

struct inode_operations nfs3_dir_inode_operations = {

	.create		= nfs_create,

	.lookup		= nfs_lookup,

	.link		= nfs_link,

	.unlink		= nfs_unlink,

	.symlink	= nfs_symlink,

	.mkdir		= nfs_mkdir,

	.rmdir		= nfs_rmdir,

	.mknod		= nfs_mknod,

	.rename		= nfs_rename,

	.permission	= nfs_permission,

	.getattr	= nfs_getattr,

	.setattr	= nfs_setattr,

	.listxattr	= nfs3_listxattr,

	.getxattr	= nfs3_getxattr,

	.setxattr	= nfs3_setxattr,

	.removexattr	= nfs3_removexattr,

};

#endif  /* CONFIG_NFS_V3 */



#ifdef CONFIG_NFS_V4



static struct dentry *nfs_atomic_lookup(struct inode *, struct dentry *, struct nameidata *);

fs/nfs/file.c

+12 −0
Original line number Diff line number Diff line
@@ -71,6 +71,18 @@ struct inode_operations nfs_file_inode_operations = { 
	.setattr	= nfs_setattr,

};



#ifdef CONFIG_NFS_V3

struct inode_operations nfs3_file_inode_operations = {

	.permission	= nfs_permission,

	.getattr	= nfs_getattr,

	.setattr	= nfs_setattr,

	.listxattr	= nfs3_listxattr,

	.getxattr	= nfs3_getxattr,

	.setxattr	= nfs3_setxattr,

	.removexattr	= nfs3_removexattr,

};

#endif  /* CONFIG_NFS_v3 */



/* Hack for future NFS swap support */

#ifndef IS_SWAPFILE

# define IS_SWAPFILE(inode)	(0)

fs/nfs/inode.c

+33 −3
Original line number Diff line number Diff line
@@ -108,6 +108,21 @@ static struct rpc_program nfs_program = { 
	.pipe_dir_name		= "/nfs",

};



#ifdef CONFIG_NFS_V3_ACL

static struct rpc_stat		nfsacl_rpcstat = { &nfsacl_program };

static struct rpc_version *	nfsacl_version[] = {

	[3]			= &nfsacl_version3,

};



struct rpc_program		nfsacl_program = {

	.name =			"nfsacl",

	.number =		NFS_ACL_PROGRAM,

	.nrvers =		sizeof(nfsacl_version) / sizeof(nfsacl_version[0]),

	.version =		nfsacl_version,

	.stats =		&nfsacl_rpcstat,

};

#endif  /* CONFIG_NFS_V3_ACL */



static inline unsigned long

nfs_fattr_to_ino_t(struct nfs_fattr *fattr)

{
@@ -165,6 +180,9 @@ nfs_umount_begin(struct super_block *sb) 
	/* -EIO all pending I/O */

	if (!IS_ERR(rpc))

		rpc_killall_tasks(rpc);

	rpc = NFS_SB(sb)->client_acl;

	if (!IS_ERR(rpc))

		rpc_killall_tasks(rpc);

}
@@ -461,8 +479,17 @@ nfs_fill_super(struct super_block *sb, struct nfs_mount_data *data, int silent) 
		atomic_inc(&server->client->cl_count);

		server->client_sys = server->client;

	}



	if (server->flags & NFS_MOUNT_VER3) {

#ifdef CONFIG_NFS_V3_ACL

		if (!(server->flags & NFS_MOUNT_NOACL)) {

			server->client_acl = rpc_bind_new_program(server->client, &nfsacl_program, 3);

			/* No errors! Assume that Sun nfsacls are supported */

			if (!IS_ERR(server->client_acl))

				server->caps |= NFS_CAP_ACLS;

		}

#else

		server->flags &= ~NFS_MOUNT_NOACL;

#endif /* CONFIG_NFS_V3_ACL */

		if (server->namelen == 0 || server->namelen > NFS3_MAXNAMLEN)

			server->namelen = NFS3_MAXNAMLEN;

		sb->s_time_gran = 1;
@@ -546,6 +573,7 @@ static int nfs_show_options(struct seq_file *m, struct vfsmount *mnt) 
		{ NFS_MOUNT_NOCTO, ",nocto", "" },

		{ NFS_MOUNT_NOAC, ",noac", "" },

		{ NFS_MOUNT_NONLM, ",nolock", ",lock" },

		{ NFS_MOUNT_NOACL, ",noacl", "" },

		{ 0, NULL, NULL }

	};

	struct proc_nfs_info *nfs_infop;
@@ -1452,7 +1480,7 @@ static struct super_block *nfs_get_sb(struct file_system_type *fs_type, 
	memset(server, 0, sizeof(struct nfs_server));

	/* Zero out the NFS state stuff */

	init_nfsv4_state(server);

	server->client = server->client_sys = ERR_PTR(-EINVAL);

	server->client = server->client_sys = server->client_acl = ERR_PTR(-EINVAL);



	root = &server->fh;

	if (data->flags & NFS_MOUNT_VER3)
@@ -1513,6 +1541,8 @@ static void nfs_kill_super(struct super_block *s) 
		rpc_shutdown_client(server->client);

	if (!IS_ERR(server->client_sys))

		rpc_shutdown_client(server->client_sys);

	if (!IS_ERR(server->client_acl))

		rpc_shutdown_client(server->client_acl);



	if (!(server->flags & NFS_MOUNT_NONLM))

		lockd_down();	/* release rpc.lockd */
@@ -1794,7 +1824,7 @@ static struct super_block *nfs4_get_sb(struct file_system_type *fs_type, 
	memset(server, 0, sizeof(struct nfs_server));

	/* Zero out the NFS state stuff */

	init_nfsv4_state(server);

	server->client = server->client_sys = ERR_PTR(-EINVAL);

	server->client = server->client_sys = server->client_acl = ERR_PTR(-EINVAL);



	p = nfs_copy_user_string(NULL, &data->hostname, 256);

	if (IS_ERR(p))