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

Commit af85852d authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Linus Torvalds
Browse files

[PATCH] nfsd4: reindent do_open_lookup() 



Minor rearrangement, cleanup of do_open_lookup().  No change in behavior.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Acked-by: default avatarNeil Brown <neilb@suse.de>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 75b2bd55

fs/nfsd/nfs4proc.c

+11 −13
Original line number Diff line number Diff line
@@ -106,27 +106,25 @@ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_o 
					open->op_fname.len, &open->op_iattr,

					&resfh, open->op_createmode,

					(u32 *)open->op_verf.data, &open->op_truncate);

	}

	else {

	} else {

		status = nfsd_lookup(rqstp, current_fh,

				     open->op_fname.data, open->op_fname.len, &resfh);

		fh_unlock(current_fh);

	}

	if (status)

		goto out;



	if (!status) {

	set_change_info(&open->op_cinfo, current_fh);



	/* set reply cache */

	fh_dup2(current_fh, &resfh);

		open->op_stateowner->so_replay.rp_openfh_len =

			resfh.fh_handle.fh_size;

	open->op_stateowner->so_replay.rp_openfh_len = resfh.fh_handle.fh_size;

	memcpy(open->op_stateowner->so_replay.rp_openfh,

				&resfh.fh_handle.fh_base,

				resfh.fh_handle.fh_size);

			&resfh.fh_handle.fh_base, resfh.fh_handle.fh_size);



	status = do_open_permission(rqstp, current_fh, open, MAY_NOP);

	}



out:

	fh_put(&resfh);

	return status;

}