linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] NFSv4.1 do not call LAYOUTRETURN when there are no legs
@ 2012-06-01 17:19 andros
  2012-06-01 17:19 ` [PATCH 2/3] NFSv4.1 mark layout when already returned andros
                   ` (2 more replies)
  0 siblings, 3 replies; 26+ messages in thread
From: andros @ 2012-06-01 17:19 UTC (permalink / raw)
  To: trond.myklebust; +Cc: linux-nfs, Andy Adamson

From: Andy Adamson <andros@netapp.com>

mark_matching_lsegs_invalid() does not indicate if the plh_segs list is
empty on entrance - and it can be empty on exit.

When the plh_segs list is emtpy, mark_matching_lsegs_invalid removes
the pnfs_layout_hdr creation reference.

Signed-off-by: Andy Adamson <andros@netapp.com>
---
 fs/nfs/pnfs.c |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index b8323aa..854df5e 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -646,7 +646,14 @@ out_err_free:
 	return NULL;
 }
 
-/* Initiates a LAYOUTRETURN(FILE) */
+/*
+ * Initiates a LAYOUTRETURN(FILE), and removes the pnfs_layout_hdr
+ * when the layout segment list is empty.
+ *
+ * Note that a pnfs_layout_hdr can exist with an empty layout segment
+ * list when LAYOUTGET has failed, or when LAYOUTGET succeeded, but the
+ * deviceid is marked invalid.
+ */
 int
 _pnfs_return_layout(struct inode *ino)
 {
@@ -655,7 +662,7 @@ _pnfs_return_layout(struct inode *ino)
 	LIST_HEAD(tmp_list);
 	struct nfs4_layoutreturn *lrp;
 	nfs4_stateid stateid;
-	int status = 0;
+	int status = 0, empty = 0;
 
 	dprintk("--> %s\n", __func__);
 
@@ -669,11 +676,17 @@ _pnfs_return_layout(struct inode *ino)
 	stateid = nfsi->layout->plh_stateid;
 	/* Reference matched in nfs4_layoutreturn_release */
 	get_layout_hdr(lo);
+	empty = list_empty(&lo->plh_segs);
 	mark_matching_lsegs_invalid(lo, &tmp_list, NULL);
 	lo->plh_block_lgets++;
 	spin_unlock(&ino->i_lock);
 	pnfs_free_lseg_list(&tmp_list);
 
+	if (empty) {
+		put_layout_hdr(lo);
+		dprintk("%s: no layout segments to return\n", __func__);
+		return status;
+	}
 	WARN_ON(test_bit(NFS_INO_LAYOUTCOMMIT, &nfsi->flags));
 
 	lrp = kzalloc(sizeof(*lrp), GFP_KERNEL);
-- 
1.7.6.4


^ permalink raw reply related	[flat|nested] 26+ messages in thread

end of thread, other threads:[~2012-06-11 16:14 UTC | newest]

Thread overview: 26+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [PATCH 2/3] NFSv4.1 mark layout when already returned andros
2012-06-02 22:51   ` 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

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).