From ce40a856199aa924c82f039c7dddac0f32d6ae81 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Thu, 16 Oct 2008 16:08:57 +0200
Subject: [PATCH] --- yaml --- r: 116287 b: refs/heads/master c:
 29d434b39c807320fbe4bcdce0ab98a0b9fcb285 h: refs/heads/master i:   116285:
 4a84696c788f4b12f1e9b8fffd3927007f7e3944   116283:
 2367a2b771a02e502b256fd39ee95164ebdb6ae7   116279:
 aa1e31d7e631714315253e54901ddb63edbffe2c   116271:
 760e98d92757b8368eaec0b7ee25784936f471fa   116255:
 f7f8ea803a80f57c791b537691db9ef95da59577   116223:
 1b5e16c2c14c14aae325227df8450215fb52be5a v: v3

---
 [refs]                     | 2 +-
 trunk/fs/fuse/fuse_i.h     | 5 +++++
 trunk/include/linux/fuse.h | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 355f239babed..41d10c9b243d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37194d0723b9b68b4b299b2564ca99e3d0a094c3
+refs/heads/master: 29d434b39c807320fbe4bcdce0ab98a0b9fcb285
diff --git a/trunk/fs/fuse/fuse_i.h b/trunk/fs/fuse/fuse_i.h
index 3a876076bdd1..35accfdd747f 100644
--- a/trunk/fs/fuse/fuse_i.h
+++ b/trunk/fs/fuse/fuse_i.h
@@ -6,6 +6,9 @@
   See the file COPYING.
 */
 
+#ifndef _FS_FUSE_I_H
+#define _FS_FUSE_I_H
+
 #include <linux/fuse.h>
 #include <linux/fs.h>
 #include <linux/mount.h>
@@ -655,3 +658,5 @@ void fuse_set_nowrite(struct inode *inode);
 void fuse_release_nowrite(struct inode *inode);
 
 u64 fuse_get_attr_version(struct fuse_conn *fc);
+
+#endif /* _FS_FUSE_I_H */
diff --git a/trunk/include/linux/fuse.h b/trunk/include/linux/fuse.h
index 265635dc9908..8bc1101e9b35 100644
--- a/trunk/include/linux/fuse.h
+++ b/trunk/include/linux/fuse.h
@@ -19,6 +19,9 @@
  *  - add file flags field to fuse_read_in and fuse_write_in
  */
 
+#ifndef _LINUX_FUSE_H
+#define _LINUX_FUSE_H
+
 #include <asm/types.h>
 #include <linux/major.h>
 
@@ -409,3 +412,5 @@ struct fuse_dirent {
 #define FUSE_DIRENT_ALIGN(x) (((x) + sizeof(__u64) - 1) & ~(sizeof(__u64) - 1))
 #define FUSE_DIRENT_SIZE(d) \
 	FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET + (d)->namelen)
+
+#endif /* _LINUX_FUSE_H */