The patch titled
nfsd4: reindent do_open_lookup()
has been removed from the -mm tree. Its filename was
nfsd4-reindent-do_open_lookup.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: nfsd4: reindent do_open_lookup()
From: "J. Bruce Fields" <bfields@xxxxxxxxxxxx>
Minor rearrangement, cleanup of do_open_lookup(). No change in behavior.
Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
Acked-by: Neil Brown <neilb@xxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/nfsd/nfs4proc.c | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff -puN fs/nfsd/nfs4proc.c~nfsd4-reindent-do_open_lookup fs/nfsd/nfs4proc.c
--- a/fs/nfsd/nfs4proc.c~nfsd4-reindent-do_open_lookup
+++ a/fs/nfsd/nfs4proc.c
@@ -106,27 +106,25 @@ do_open_lookup(struct svc_rqst *rqstp, s
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_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;
- memcpy(open->op_stateowner->so_replay.rp_openfh,
- &resfh.fh_handle.fh_base,
- resfh.fh_handle.fh_size);
+ /* set reply cache */
+ fh_dup2(current_fh, &resfh);
+ 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);
- status = do_open_permission(rqstp, current_fh, open, MAY_NOP);
- }
+ status = do_open_permission(rqstp, current_fh, open, MAY_NOP);
+out:
fh_put(&resfh);
return status;
}
_
Patches currently in -mm which might be from bfields@xxxxxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
