Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Aneesh Kumar K.V and committed by
Eric Van Hensbergen
e0459f57 23b08e97

+11 -3
+3 -1
fs/9p/fid.h
··· 19 19 * Boston, MA 02111-1301 USA 20 20 * 21 21 */ 22 - 22 + #ifndef FS_9P_FID_H 23 + #define FS_9P_FID_H 23 24 #include <linux/list.h> 24 25 25 26 /** ··· 47 46 struct p9_fid *v9fs_fid_clone(struct dentry *dentry); 48 47 int v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid); 49 48 struct p9_fid *v9fs_writeback_fid(struct dentry *dentry); 49 + #endif
+4
fs/9p/v9fs.h
··· 20 20 * Boston, MA 02111-1301 USA 21 21 * 22 22 */ 23 + #ifndef FS_9P_V9FS_H 24 + #define FS_9P_V9FS_H 25 + 23 26 #include <linux/backing-dev.h> 24 27 25 28 /** ··· 200 197 else 201 198 return v9fs_inode_from_fid(v9ses, fid, sb); 202 199 } 200 + #endif
+4 -2
fs/9p/v9fs_vfs.h
··· 20 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 26 /* plan9 semantics are that created files are implicitly opened. 25 27 * But linux semantics are that you call create, then open. ··· 38 36 * unlink calls remove, which is an implicit clunk. So we have to track 39 37 * that kind of thing so that we don't try to clunk a dead fid. 40 38 */ 39 + #define P9_LOCK_TIMEOUT (30*HZ) 41 40 42 41 extern struct file_system_type v9fs_fs_type; 43 42 extern const struct address_space_operations v9fs_addr_operations; ··· 82 79 v9inode->cache_validity |= V9FS_INO_INVALID_ATTR; 83 80 return; 84 81 } 85 - 86 - #define P9_LOCK_TIMEOUT (30*HZ) 82 + #endif