From: andros@netapp.com
To: trond.myklebust@netapp.com
Cc: linux-nfs@vger.kernel.org, Andy Adamson <andros@netapp.com>
Subject: [PATCH 2/3] NFSv4.1 mark layout when already returned
Date: Fri, 1 Jun 2012 13:19:37 -0400 [thread overview]
Message-ID: <1338571178-2096-2-git-send-email-andros@netapp.com> (raw)
In-Reply-To: <1338571178-2096-1-git-send-email-andros@netapp.com>
From: Andy Adamson <andros@netapp.com>
When fencing, pnfs_return_layout can be called mulitple times with in-flight
i/o referencing lsegs on it's plh_segs list.
Remember that LAYOUTRETURN has been called, and do not call it again.
Signed-off-by: Andy Adamson <andros@netapp.com>
---
fs/nfs/pnfs.c | 6 ++++--
fs/nfs/pnfs.h | 13 +++++++++++++
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 854df5e..9ffd5f8 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -664,11 +664,11 @@ _pnfs_return_layout(struct inode *ino)
nfs4_stateid stateid;
int status = 0, empty = 0;
- dprintk("--> %s\n", __func__);
+ dprintk("--> %s for inode %lu\n", __func__, ino->i_ino);
spin_lock(&ino->i_lock);
lo = nfsi->layout;
- if (!lo) {
+ if (!lo || pnfs_test_layout_returned(lo)) {
spin_unlock(&ino->i_lock);
dprintk("%s: no layout to return\n", __func__);
return status;
@@ -705,6 +705,8 @@ _pnfs_return_layout(struct inode *ino)
lrp->clp = NFS_SERVER(ino)->nfs_client;
status = nfs4_proc_layoutreturn(lrp);
+ if (status == 0)
+ pnfs_mark_layout_returned(lo);
out:
dprintk("<-- %s status: %d\n", __func__, status);
return status;
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 29fd23c..8be6de2 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -64,6 +64,7 @@ enum {
NFS_LAYOUT_ROC, /* some lseg had roc bit set */
NFS_LAYOUT_DESTROYED, /* no new use of layout allowed */
NFS_LAYOUT_INVALID, /* layout is being destroyed */
+ NFS_LAYOUT_RETURNED, /* layout has already been returned */
};
enum layoutdriver_policy_flags {
@@ -255,6 +256,18 @@ struct nfs4_deviceid_node *nfs4_insert_deviceid_node(struct nfs4_deviceid_node *
bool nfs4_put_deviceid_node(struct nfs4_deviceid_node *);
void nfs4_deviceid_purge_client(const struct nfs_client *);
+static inline void
+pnfs_mark_layout_returned(struct pnfs_layout_hdr *lo)
+{
+ set_bit(NFS_LAYOUT_RETURNED, &lo->plh_flags);
+}
+
+static inline bool
+pnfs_test_layout_returned(struct pnfs_layout_hdr *lo)
+{
+ return test_bit(NFS_LAYOUT_RETURNED, &lo->plh_flags);
+}
+
static inline int lo_fail_bit(u32 iomode)
{
return iomode == IOMODE_RW ?
--
1.7.6.4
next prev parent reply other threads:[~2012-06-01 17:21 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-01 17:19 [PATCH 1/3] NFSv4.1 do not call LAYOUTRETURN when there are no legs andros
2012-06-01 17:19 ` andros [this message]
2012-06-02 22:51 ` [PATCH 2/3] NFSv4.1 mark layout when already returned Boaz Harrosh
2012-06-05 13:36 ` Adamson, Andy
2012-06-05 13:47 ` Andy Adamson
2012-06-05 14:54 ` Boaz Harrosh
2012-06-05 19:22 ` Andy Adamson
2012-06-05 20:49 ` Boaz Harrosh
2012-06-11 9:56 ` Benny Halevy
2012-06-11 10:44 ` Boaz Harrosh
2012-06-11 14:04 ` Benny Halevy
2012-06-11 14:21 ` Adamson, Andy
2012-06-11 14:51 ` Boaz Harrosh
2012-06-11 15:41 ` Adamson, Andy
2012-06-11 16:14 ` Boaz Harrosh
2012-06-11 15:08 ` Adamson, Andy
2012-06-11 15:38 ` Benny Halevy
2012-06-11 15:52 ` Adamson, Andy
2012-06-11 16:07 ` Boaz Harrosh
2012-06-11 15:59 ` Boaz Harrosh
2012-06-01 17:19 ` [PATCH 3/3] NFSv4.1 fence all layouts with file layout data server connection errors andros
2012-06-02 22:33 ` Boaz Harrosh
2012-06-04 13:49 ` Adamson, Andy
2012-06-02 23:00 ` [PATCH 1/3] NFSv4.1 do not call LAYOUTRETURN when there are no legs Boaz Harrosh
2012-06-05 13:36 ` Adamson, Andy
2012-06-05 15:01 ` Boaz Harrosh
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=1338571178-2096-2-git-send-email-andros@netapp.com \
--to=andros@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@netapp.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).