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

Commit f25b874d authored by Jeff Layton's avatar Jeff Layton Committed by Trond Myklebust
Browse files

NFS: missing nfs_fattr_init in nfs3_proc_getacl and nfs3_proc_setacls (resend #2) 



The fattrs used in the NFSv3 getacl/setacl calls are not being properly
initialized. This occasionally causes nfs_update_inode to fall into
NFSv4 specific codepaths when handling post-op attrs from these calls.

Thanks to Cai Qian for noticing the spurious NFSv4 messages in debug
output from a v3 mount...

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent f200c11c

fs/nfs/nfs3acl.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -229,6 +229,7 @@ struct posix_acl *nfs3_proc_getacl(struct inode *inode, int type) 




	dprintk("NFS call getacl\n");

	dprintk("NFS call getacl\n");

	msg.rpc_proc = &server->client_acl->cl_procinfo[ACLPROC3_GETACL];

	msg.rpc_proc = &server->client_acl->cl_procinfo[ACLPROC3_GETACL];

	nfs_fattr_init(&fattr);

	status = rpc_call_sync(server->client_acl, &msg, 0);

	status = rpc_call_sync(server->client_acl, &msg, 0);

	dprintk("NFS reply getacl: %d\n", status);

	dprintk("NFS reply getacl: %d\n", status);
@@ -322,6 +323,7 @@ static int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl, 




	dprintk("NFS call setacl\n");

	dprintk("NFS call setacl\n");

	msg.rpc_proc = &server->client_acl->cl_procinfo[ACLPROC3_SETACL];

	msg.rpc_proc = &server->client_acl->cl_procinfo[ACLPROC3_SETACL];

	nfs_fattr_init(&fattr);

	status = rpc_call_sync(server->client_acl, &msg, 0);

	status = rpc_call_sync(server->client_acl, &msg, 0);

	nfs_access_zap_cache(inode);

	nfs_access_zap_cache(inode);

	nfs_zap_acl_cache(inode);

	nfs_zap_acl_cache(inode);