From: "J. Bruce Fields" <bfields@redhat.com>
To: linux-nfs@vger.kernel.org
Cc: "J. Bruce Fields" <bfields@redhat.com>
Subject: [PATCH 3/7] nfsd4: process_open2 cleanup
Date: Tue, 10 Jul 2012 12:07:42 -0400 [thread overview]
Message-ID: <1341936466-3821-4-git-send-email-bfields@redhat.com> (raw)
In-Reply-To: <1341936466-3821-1-git-send-email-bfields@redhat.com>
From: "J. Bruce Fields" <bfields@redhat.com>
Note we can simplify the error handling a little by doing the truncate
earlier.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---
fs/nfsd/nfs4state.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index de8f7e4..9efa405 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -3013,14 +3013,12 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
status = nfs4_get_vfs_file(rqstp, fp, current_fh, open);
if (status)
goto out;
+ status = nfsd4_truncate(rqstp, current_fh, open);
+ if (status)
+ goto out;
stp = open->op_stp;
open->op_stp = NULL;
init_open_stateid(stp, fp, open);
- status = nfsd4_truncate(rqstp, current_fh, open);
- if (status) {
- release_open_stateid(stp);
- goto out;
- }
}
update_stateid(&stp->st_stid.sc_stateid);
memcpy(&open->op_stateid, &stp->st_stid.sc_stateid, sizeof(stateid_t));
--
1.7.9.5
next prev parent reply other threads:[~2012-07-10 16:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-10 16:07 [PATCH 0/7] 3.6 nfsd patches J. Bruce Fields
2012-07-10 16:07 ` [PATCH 1/7] nfsd4: remove unnecessary comment J. Bruce Fields
2012-07-10 16:07 ` [PATCH 2/7] nfsd4: nfsd4_lock() cleanup J. Bruce Fields
2012-07-10 16:07 ` J. Bruce Fields [this message]
2012-07-10 16:07 ` [PATCH 4/7] nfsd4: our filesystems are normally case sensitive J. Bruce Fields
2012-07-10 17:34 ` Christoph Hellwig
2012-07-10 19:21 ` J. Bruce Fields
2012-07-10 16:07 ` [PATCH 5/7] nfsd4: release openowners on free in >=4.1 case J. Bruce Fields
2012-07-10 16:07 ` [PATCH 6/7] nfsd: allow owner_override only for regular files J. Bruce Fields
2012-07-10 16:07 ` [PATCH 7/7] nfsd: share some function prototypes J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1341936466-3821-4-git-send-email-bfields@redhat.com \
--to=bfields@redhat.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.