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

Commit 52748819 authored by Fred Isaman's avatar Fred Isaman Committed by Linus Torvalds
Browse files

[PATCH] nfsd4: clean up settattr code 



Clean up some unnecessary special-casing in the setattr code..

Signed-off-by: default avatarFred Isaman <iisaman@citi.umich.edu>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 34081efc

fs/nfsd/nfs4proc.c

+1 −9
Original line number Diff line number Diff line
@@ -594,10 +594,6 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_se 
{

	int status = nfs_ok;



	if (!current_fh->fh_dentry)

		return nfserr_nofilehandle;



	status = nfs_ok;

	if (setattr->sa_iattr.ia_valid & ATTR_SIZE) {

		nfs4_lock_state();

		status = nfs4_preprocess_stateid_op(current_fh,
@@ -799,17 +795,13 @@ nfsd4_proc_compound(struct svc_rqst *rqstp, 
		/* All operations except RENEW, SETCLIENTID, RESTOREFH

		* SETCLIENTID_CONFIRM, PUTFH and PUTROOTFH

		* require a valid current filehandle

		*

		* SETATTR NOFILEHANDLE error handled in nfsd4_setattr

		* due to required returned bitmap argument

		*/

		if ((!current_fh->fh_dentry) &&

		   !((op->opnum == OP_PUTFH) || (op->opnum == OP_PUTROOTFH) ||

		   (op->opnum == OP_SETCLIENTID) ||

		   (op->opnum == OP_SETCLIENTID_CONFIRM) ||

		   (op->opnum == OP_RENEW) || (op->opnum == OP_RESTOREFH) ||

		   (op->opnum == OP_RELEASE_LOCKOWNER) ||

		   (op->opnum == OP_SETATTR))) {

		   (op->opnum == OP_RELEASE_LOCKOWNER))) {

			op->status = nfserr_nofilehandle;

			goto encode_op;

		}