From b3ebe42ae34be6527078ec54d33446c354d9b389 Mon Sep 17 00:00:00 2001
From: Fred Isaman <iisaman@netapp.com>
Date: Wed, 23 Mar 2011 13:27:49 +0000
Subject: [PATCH] --- yaml --- r: 242415 b: refs/heads/master c:
 c879513e91c9e38957f0d9647d22469f1887e4da h: refs/heads/master i:   242413:
 ef05941620d6b97b892b53447304c620e77e7882   242411:
 4ce5e02c0846283562fbb629d2e7fc8a25b75072   242407:
 108d7982cc4d3b3e3f3e07e38494f350d08925e0   242399:
 1e192e4e7cf2e6f9ae17e8ea47be116fb4e6cc03 v: v3

---
 [refs]                        |  2 +-
 trunk/fs/nfs/nfs4filelayout.c | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index c9a684465655..b1527e16204e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5917ce8440ba0b3f2adee613b5f1258ac5efff02
+refs/heads/master: c879513e91c9e38957f0d9647d22469f1887e4da
diff --git a/trunk/fs/nfs/nfs4filelayout.c b/trunk/fs/nfs/nfs4filelayout.c
index 428558464817..9401afd5650e 100644
--- a/trunk/fs/nfs/nfs4filelayout.c
+++ b/trunk/fs/nfs/nfs4filelayout.c
@@ -496,6 +496,16 @@ filelayout_decode_layout(struct pnfs_layout_hdr *flo,
 	return 0;
 }
 
+static void
+filelayout_free_lseg(struct pnfs_layout_segment *lseg)
+{
+	struct nfs4_filelayout_segment *fl = FILELAYOUT_LSEG(lseg);
+
+	dprintk("--> %s\n", __func__);
+	nfs4_fl_put_deviceid(fl->dsaddr);
+	_filelayout_free_lseg(fl);
+}
+
 static struct pnfs_layout_segment *
 filelayout_alloc_lseg(struct pnfs_layout_hdr *layoutid,
 		      struct nfs4_layoutget_res *lgr)
@@ -517,16 +527,6 @@ filelayout_alloc_lseg(struct pnfs_layout_hdr *layoutid,
 	return &fl->generic_hdr;
 }
 
-static void
-filelayout_free_lseg(struct pnfs_layout_segment *lseg)
-{
-	struct nfs4_filelayout_segment *fl = FILELAYOUT_LSEG(lseg);
-
-	dprintk("--> %s\n", __func__);
-	nfs4_fl_put_deviceid(fl->dsaddr);
-	_filelayout_free_lseg(fl);
-}
-
 /*
  * filelayout_pg_test(). Called by nfs_can_coalesce_requests()
  *