From bc55146dc3e757f905fdcda8e362f9b443581742 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 30 Apr 2012 18:39:20 -0400
Subject: [PATCH] --- yaml --- r: 308568 b: refs/heads/master c:
 4f97615d19c370d1d907ef37f8bcd9c3672851ca h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/nfs_xdr.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0fa47d0e587a..2f3ac6036a6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 292f3eeef00a20fa0ef4feec62792ad0065760a0
+refs/heads/master: 4f97615d19c370d1d907ef37f8bcd9c3672851ca
diff --git a/trunk/include/linux/nfs_xdr.h b/trunk/include/linux/nfs_xdr.h
index c940d46eb423..6deb8f097c42 100644
--- a/trunk/include/linux/nfs_xdr.h
+++ b/trunk/include/linux/nfs_xdr.h
@@ -1176,6 +1176,11 @@ struct nfs41_free_stateid_res {
 	struct nfs4_sequence_res	seq_res;
 };
 
+#else
+
+struct pnfs_ds_commit_info {
+};
+
 #endif /* CONFIG_NFS_V4_1 */
 
 struct nfs_page;