From 53c58d6afa940ceae9055e7300e3188dbfcaca1a Mon Sep 17 00:00:00 2001
From: Peng Tao <bergwolf@gmail.com>
Date: Thu, 2 Aug 2012 15:36:09 +0300
Subject: [PATCH] --- yaml --- r: 322102 b: refs/heads/master c:
 f6166384095b7ecf77752b5e9096e6d03d75f7ae h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/fs/nfs/pagelist.c        | 2 ++
 trunk/include/linux/nfs_page.h | 1 +
 trunk/include/linux/nfs_xdr.h  | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0462e9c029e4..657a4c71719c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21d1f58aedc5f7ac4bb0c4e3d78c74ea31ac050f
+refs/heads/master: f6166384095b7ecf77752b5e9096e6d03d75f7ae
diff --git a/trunk/fs/nfs/pagelist.c b/trunk/fs/nfs/pagelist.c
index 1a6732ed04a4..311a79681e2b 100644
--- a/trunk/fs/nfs/pagelist.c
+++ b/trunk/fs/nfs/pagelist.c
@@ -49,6 +49,7 @@ void nfs_pgheader_init(struct nfs_pageio_descriptor *desc,
 	hdr->io_start = req_offset(hdr->req);
 	hdr->good_bytes = desc->pg_count;
 	hdr->dreq = desc->pg_dreq;
+	hdr->layout_private = desc->pg_layout_private;
 	hdr->release = release;
 	hdr->completion_ops = desc->pg_completion_ops;
 	if (hdr->completion_ops->init_hdr)
@@ -268,6 +269,7 @@ void nfs_pageio_init(struct nfs_pageio_descriptor *desc,
 	desc->pg_error = 0;
 	desc->pg_lseg = NULL;
 	desc->pg_dreq = NULL;
+	desc->pg_layout_private = NULL;
 }
 EXPORT_SYMBOL_GPL(nfs_pageio_init);
 
diff --git a/trunk/include/linux/nfs_page.h b/trunk/include/linux/nfs_page.h
index 880805774f9f..92ce5783b707 100644
--- a/trunk/include/linux/nfs_page.h
+++ b/trunk/include/linux/nfs_page.h
@@ -69,6 +69,7 @@ struct nfs_pageio_descriptor {
 	const struct nfs_pgio_completion_ops *pg_completion_ops;
 	struct pnfs_layout_segment *pg_lseg;
 	struct nfs_direct_req	*pg_dreq;
+	void			*pg_layout_private;
 };
 
 #define NFS_WBACK_BUSY(req)	(test_bit(PG_BUSY,&(req)->wb_flags))
diff --git a/trunk/include/linux/nfs_xdr.h b/trunk/include/linux/nfs_xdr.h
index 00485e084394..ac7c8ae254f2 100644
--- a/trunk/include/linux/nfs_xdr.h
+++ b/trunk/include/linux/nfs_xdr.h
@@ -1248,6 +1248,7 @@ struct nfs_pgio_header {
 	void (*release) (struct nfs_pgio_header *hdr);
 	const struct nfs_pgio_completion_ops *completion_ops;
 	struct nfs_direct_req	*dreq;
+	void			*layout_private;
 	spinlock_t		lock;
 	/* fields protected by lock */
 	int			pnfs_error;