---

yaml --- r: 262641 b: refs/heads/master c: 26ae93c h: refs/heads/master i: 262639: 578571f v: v3
git-mirror · Aug 4, 2011 · 0d985de · 0d985de
1 parent 2052eb6
commit 0d985de
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 51 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 655b16128482fd12808f77a6799eea5419c93709
+refs/heads/master: 26ae93c2dc7152463d319c28768f242a11a54620
diff --git a/trunk/fs/exofs/exofs.h b/trunk/fs/exofs/exofs.h
@@ -36,13 +36,9 @@
 #include <linux/fs.h>
 #include <linux/time.h>
 #include <linux/backing-dev.h>
+#include <linux/pnfs_osd_xdr.h>
 #include "common.h"
 
-/* FIXME: Remove once pnfs hits mainline
- * #include <linux/exportfs/pnfs_osd_xdr.h>
- */
-#include "pnfs.h"
-
 #define EXOFS_ERR(fmt, a...) printk(KERN_ERR "exofs: " fmt, ##a)
 
 #ifdef CONFIG_EXOFS_DEBUG

diff --git a/trunk/fs/exofs/pnfs.h b/trunk/fs/exofs/pnfs.h