From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Mon, 31 Jan 2005 20:33:28 +0000 (+0000)
Subject: fix inline declaration, gcc-3.4 complains
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~276
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3099723a53c85929acab5c6a1e6fccf035939b62;p=linux-2.6.git

fix inline declaration, gcc-3.4 complains
---

diff --git a/fs/rcfs/super.c b/fs/rcfs/super.c
index f013df226..4ed49fd15 100644
--- a/fs/rcfs/super.c
+++ b/fs/rcfs/super.c
@@ -45,7 +45,7 @@
 
 static kmem_cache_t *rcfs_inode_cachep;
 
-inline struct rcfs_inode_info *RCFS_I(struct inode *inode)
+struct rcfs_inode_info *RCFS_I(struct inode *inode)
 {
 	return container_of(inode, struct rcfs_inode_info, vfs_inode);
 }
diff --git a/include/linux/rcfs.h b/include/linux/rcfs.h
index a2a65e8a6..bb2981368 100644
--- a/include/linux/rcfs.h
+++ b/include/linux/rcfs.h
@@ -7,10 +7,8 @@
 #include <linux/ckrm_rc.h>
 #include <linux/ckrm_ce.h>
 
-
-
-/* The following declarations cannot be included in any of ckrm*.h files without 
-   jumping hoops. Remove later when rearrangements done */
+/* The following declarations cannot be included in any of ckrm*.h files 
+   without jumping hoops. Remove later when rearrangements done */
 
 // Hubertus .. taken out 
 //extern ckrm_res_callback_t ckrm_res_ctlrs[CKRM_MAX_RES_CTLRS];
@@ -30,7 +28,6 @@ typedef struct rcfs_inode_info {
 #define RCFS_DEFAULT_DIR_MODE	(S_IFDIR | S_IRUGO | S_IXUGO)
 #define RCFS_DEFAULT_FILE_MODE	(S_IFREG | S_IRUSR | S_IWUSR | S_IRGRP |S_IROTH)
 
-
 struct rcfs_magf {
 	char name[RCFS_MAGF_NAMELEN];
 	int mode;
@@ -39,29 +36,29 @@ struct rcfs_magf {
 };
 
 struct rcfs_mfdesc {
-	struct rcfs_magf *rootmf;     // Root directory and its magic files
-	int              rootmflen;   // length of above array
-	// Can have a different magf describing magic files for non-root entries too
+	struct rcfs_magf *rootmf;	// Root directory and its magic files
+	int rootmflen;			// length of above array
+	// Can have a different magf describing magic files 
+	// for non-root entries too
 };
 
 extern struct rcfs_mfdesc *genmfdesc[];
 
-inline struct rcfs_inode_info *RCFS_I(struct inode *inode);
+extern struct rcfs_inode_info *RCFS_I(struct inode *inode);
 
 int rcfs_empty(struct dentry *);
 struct inode *rcfs_get_inode(struct super_block *, int, dev_t);
 int rcfs_mknod(struct inode *, struct dentry *, int, dev_t);
-int _rcfs_mknod(struct inode *, struct dentry *, int , dev_t);
+int _rcfs_mknod(struct inode *, struct dentry *, int, dev_t);
 int rcfs_mkdir(struct inode *, struct dentry *, int);
 ckrm_core_class_t *rcfs_make_core(struct dentry *, struct ckrm_core_class *);
 struct dentry *rcfs_set_magf_byname(char *, void *);
 
-struct dentry * rcfs_create_internal(struct dentry *, struct rcfs_magf *, int);
+struct dentry *rcfs_create_internal(struct dentry *, struct rcfs_magf *, int);
 int rcfs_delete_internal(struct dentry *);
 int rcfs_create_magic(struct dentry *, struct rcfs_magf *, int);
 int rcfs_clear_magic(struct dentry *);
 
-
 extern struct super_operations rcfs_super_ops;
 extern struct address_space_operations rcfs_aops;
 
@@ -69,30 +66,31 @@ extern struct inode_operations rcfs_dir_inode_operations;
 extern struct inode_operations rcfs_rootdir_inode_operations;
 extern struct inode_operations rcfs_file_inode_operations;
 
-
 extern struct file_operations target_fileops;
 extern struct file_operations shares_fileops;
 extern struct file_operations stats_fileops;
 extern struct file_operations config_fileops;
 extern struct file_operations members_fileops;
+extern struct file_operations reclassify_fileops;
 extern struct file_operations rcfs_file_operations;
 
 // Callbacks into rcfs from ckrm 
 
 typedef struct rcfs_functions {
-	int  (* mkroot)(struct rcfs_magf *,int, struct dentry **);
-	int  (* rmroot)(struct dentry *);
-	int  (* register_classtype)(ckrm_classtype_t *);
-	int  (* deregister_classtype)(ckrm_classtype_t *);
+	int (*mkroot) (struct rcfs_magf *, int, struct dentry **);
+	int (*rmroot) (struct dentry *);
+	int (*register_classtype) (ckrm_classtype_t *);
+	int (*deregister_classtype) (ckrm_classtype_t *);
 } rcfs_fn_t;
 
 int rcfs_register_classtype(ckrm_classtype_t *);
 int rcfs_deregister_classtype(ckrm_classtype_t *);
-int rcfs_mkroot(struct rcfs_magf *, int , struct dentry **);
+int rcfs_mkroot(struct rcfs_magf *, int, struct dentry **);
 int rcfs_rmroot(struct dentry *);
 
-#define RCFS_ROOT "/rcfs"         // Hubertus .. we should use the mount point instead of hardcoded
+#define RCFS_ROOT "/rcfs"  	// Hubertus .. we should use the mount point 
+				// instead of hardcoded
 extern struct dentry *rcfs_rootde;
+extern rbce_eng_callback_t rcfs_eng_callbacks;
 
-
-#endif /* _LINUX_RCFS_H */ 
+#endif				/* _LINUX_RCFS_H */