diff options
author | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2011-02-28 06:34:09 -0500 |
---|---|---|
committer | Eric Van Hensbergen <ericvh@gmail.com> | 2011-03-15 10:57:41 -0400 |
commit | e0459f57b8b3bbabf6f11f73da4d17abb0c159de (patch) | |
tree | 5741e6668857da8f1b2dcd950e12c9da06af9fc5 | |
parent | 23b08e97f2c0d68c2a46a11e4fd8a4686d7351ee (diff) |
fs/9p: Prevent multiple inclusion of same header
Add necessary #ifndef #endif blocks to avoid mulitple inclusion of same headers
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
-rw-r--r-- | fs/9p/fid.h | 4 | ||||
-rw-r--r-- | fs/9p/v9fs.h | 4 | ||||
-rw-r--r-- | fs/9p/v9fs_vfs.h | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/fs/9p/fid.h b/fs/9p/fid.h index c058f1c7656e..bb0b6e7f58fc 100644 --- a/fs/9p/fid.h +++ b/fs/9p/fid.h | |||
@@ -19,7 +19,8 @@ | |||
19 | * Boston, MA 02111-1301 USA | 19 | * Boston, MA 02111-1301 USA |
20 | * | 20 | * |
21 | */ | 21 | */ |
22 | 22 | #ifndef FS_9P_FID_H | |
23 | #define FS_9P_FID_H | ||
23 | #include <linux/list.h> | 24 | #include <linux/list.h> |
24 | 25 | ||
25 | /** | 26 | /** |
@@ -46,3 +47,4 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry); | |||
46 | struct p9_fid *v9fs_fid_clone(struct dentry *dentry); | 47 | struct p9_fid *v9fs_fid_clone(struct dentry *dentry); |
47 | int v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid); | 48 | int v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid); |
48 | struct p9_fid *v9fs_writeback_fid(struct dentry *dentry); | 49 | struct p9_fid *v9fs_writeback_fid(struct dentry *dentry); |
50 | #endif | ||
diff --git a/fs/9p/v9fs.h b/fs/9p/v9fs.h index cfdc05527f89..bd8496db135b 100644 --- a/fs/9p/v9fs.h +++ b/fs/9p/v9fs.h | |||
@@ -20,6 +20,9 @@ | |||
20 | * Boston, MA 02111-1301 USA | 20 | * Boston, MA 02111-1301 USA |
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | #ifndef FS_9P_V9FS_H | ||
24 | #define FS_9P_V9FS_H | ||
25 | |||
23 | #include <linux/backing-dev.h> | 26 | #include <linux/backing-dev.h> |
24 | 27 | ||
25 | /** | 28 | /** |
@@ -197,3 +200,4 @@ v9fs_get_inode_from_fid(struct v9fs_session_info *v9ses, struct p9_fid *fid, | |||
197 | else | 200 | else |
198 | return v9fs_inode_from_fid(v9ses, fid, sb); | 201 | return v9fs_inode_from_fid(v9ses, fid, sb); |
199 | } | 202 | } |
203 | #endif | ||
diff --git a/fs/9p/v9fs_vfs.h b/fs/9p/v9fs_vfs.h index 591807f20188..4014160903a9 100644 --- a/fs/9p/v9fs_vfs.h +++ b/fs/9p/v9fs_vfs.h | |||
@@ -20,6 +20,8 @@ | |||
20 | * Boston, MA 02111-1301 USA | 20 | * Boston, MA 02111-1301 USA |
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | #ifndef FS_9P_V9FS_VFS_H | ||
24 | #define FS_9P_V9FS_VFS_H | ||
23 | 25 | ||
24 | /* plan9 semantics are that created files are implicitly opened. | 26 | /* plan9 semantics are that created files are implicitly opened. |
25 | * But linux semantics are that you call create, then open. | 27 | * But linux semantics are that you call create, then open. |
@@ -36,6 +38,7 @@ | |||
36 | * unlink calls remove, which is an implicit clunk. So we have to track | 38 | * unlink calls remove, which is an implicit clunk. So we have to track |
37 | * that kind of thing so that we don't try to clunk a dead fid. | 39 | * that kind of thing so that we don't try to clunk a dead fid. |
38 | */ | 40 | */ |
41 | #define P9_LOCK_TIMEOUT (30*HZ) | ||
39 | 42 | ||
40 | extern struct file_system_type v9fs_fs_type; | 43 | extern struct file_system_type v9fs_fs_type; |
41 | extern const struct address_space_operations v9fs_addr_operations; | 44 | extern const struct address_space_operations v9fs_addr_operations; |
@@ -79,5 +82,4 @@ static inline void v9fs_invalidate_inode_attr(struct inode *inode) | |||
79 | v9inode->cache_validity |= V9FS_INO_INVALID_ATTR; | 82 | v9inode->cache_validity |= V9FS_INO_INVALID_ATTR; |
80 | return; | 83 | return; |
81 | } | 84 | } |
82 | 85 | #endif | |
83 | #define P9_LOCK_TIMEOUT (30*HZ) | ||