NFSv3: Fix return value of nfs3_proc_setacls (8f493b9c) · Commits · 戴 / test

nfs3_proc_setacls is used internally by the NFSv3 create operations to set the acl after the file has been created. If the operation fails because the server doesn't support acls, then it must return '0', not -EOPNOTSUPP. Reported-by:

Russell King <linux@arm.linux.org.uk> Link: http://lkml.kernel.org/r/20140201010328.GI15937@n2100.arm.linux.org.uk Cc: Christoph Hellwig <hch@lst.de> Tested-by:

Takashi Iwai <tiwai@suse.de> Signed-off-by:

Trond Myklebust <trond.myklebust@primarydata.com>

fs/nfs/nfs3acl.c

+11 −2

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ getout:
		return ERR_PTR(status);
		}

		int nfs3_proc_setacls(struct inode inode, struct posix_acl acl,
		static int __nfs3_proc_setacls(struct inode inode, struct posix_acl acl,
		struct posix_acl *dfacl)
		{
		struct nfs_server *server = NFS_SERVER(inode);
		@@ -198,6 +198,15 @@ out:
		return status;
		}

		int nfs3_proc_setacls(struct inode inode, struct posix_acl acl,
		struct posix_acl *dfacl)
		{
		int ret;
		ret = __nfs3_proc_setacls(inode, acl, dfacl);
		return (ret == -EOPNOTSUPP) ? 0 : ret;

		}

		int nfs3_set_acl(struct inode inode, struct posix_acl acl, int type)
		{
		struct posix_acl alloc = NULL, dfacl = NULL;
		@@ -225,7 +234,7 @@ int nfs3_set_acl(struct inode inode, struct posix_acl acl, int type)
		if (IS_ERR(alloc))
		goto fail;
		}
		status = nfs3_proc_setacls(inode, acl, dfacl);
		status = __nfs3_proc_setacls(inode, acl, dfacl);
		posix_acl_release(alloc);
		return status;

Admin message