ore: Make ore its own module

Boaz Harrosh · Boaz Harrosh · commit cf283ade08c4 · 2011-08-06T19:36:19.000-07:00
Export everything from ore need exporting. Change Kbuild and Kconfig
to build ore.ko as an independent module. Import ore from exofs

Signed-off-by: Boaz Harrosh &lt;bharrosh@panasas.com&gt;
diff --git a/fs/exofs/Kbuild b/fs/exofs/Kbuild
@@ -12,5 +12,8 @@
 # Kbuild - Gets included from the Kernels Makefile and build system
 #
 
-exofs-y := ore.o inode.o file.o symlink.o namei.o dir.o super.o
+# ore module library
+obj-$(CONFIG_ORE) += ore.o
+
+exofs-y := inode.o file.o symlink.o namei.o dir.o super.o
 obj-$(CONFIG_EXOFS_FS) += exofs.o
diff --git a/fs/exofs/Kconfig b/fs/exofs/Kconfig
@@ -1,6 +1,10 @@
+config ORE
+	tristate
+
 config EXOFS_FS
 	tristate "exofs: OSD based file system support"
 	depends on SCSI_OSD_ULD
+	select ORE
 	help
 	  EXOFS is a file system that uses an OSD storage device,
 	  as its backing storage.
diff --git a/fs/exofs/ore.c b/fs/exofs/ore.c
@@ -43,6 +43,10 @@
 #define ORE_DBGMSG2(M...) do {} while (0)
 /* #define ORE_DBGMSG2 ORE_DBGMSG */
 
+MODULE_AUTHOR("Boaz Harrosh <bharrosh@panasas.com>");
+MODULE_DESCRIPTION("Objects Raid Engine ore.ko");
+MODULE_LICENSE("GPL");
+
 static u8 *_ios_cred(struct ore_io_state *ios, unsigned index)
 {
 	return ios->comps->comps[index & ios->comps->single_comp].cred;
@@ -84,12 +88,14 @@ int  ore_get_rw_state(struct ore_layout *layout, struct ore_components *comps,
 	*pios = ios;
 	return 0;
 }
+EXPORT_SYMBOL(ore_get_rw_state);
 
 int  ore_get_io_state(struct ore_layout *layout, struct ore_components *comps,
 		      struct ore_io_state **ios)
 {
 	return ore_get_rw_state(layout, comps, true, 0, 0, ios);
 }
+EXPORT_SYMBOL(ore_get_io_state);
 
 void ore_put_io_state(struct ore_io_state *ios)
 {
@@ -108,6 +114,7 @@ void ore_put_io_state(struct ore_io_state *ios)
 		kfree(ios);
 	}
 }
+EXPORT_SYMBOL(ore_put_io_state);
 
 static void _sync_done(struct ore_io_state *ios, void *p)
 {
@@ -236,6 +243,7 @@ int ore_check_io(struct ore_io_state *ios, u64 *resid)
 
 	return acumulated_lin_err;
 }
+EXPORT_SYMBOL(ore_check_io);
 
 /*
  * L - logical offset into the file
@@ -487,6 +495,7 @@ int ore_create(struct ore_io_state *ios)
 out:
 	return ret;
 }
+EXPORT_SYMBOL(ore_create);
 
 int ore_remove(struct ore_io_state *ios)
 {
@@ -511,6 +520,7 @@ int ore_remove(struct ore_io_state *ios)
 out:
 	return ret;
 }
+EXPORT_SYMBOL(ore_remove);
 
 static int _write_mirror(struct ore_io_state *ios, int cur_comp)
 {
@@ -617,6 +627,7 @@ int ore_write(struct ore_io_state *ios)
 	ret = ore_io_execute(ios);
 	return ret;
 }
+EXPORT_SYMBOL(ore_write);
 
 static int _read_mirror(struct ore_io_state *ios, unsigned cur_comp)
 {
@@ -685,6 +696,7 @@ int ore_read(struct ore_io_state *ios)
 	ret = ore_io_execute(ios);
 	return ret;
 }
+EXPORT_SYMBOL(ore_read);
 
 int extract_attr_from_ios(struct ore_io_state *ios, struct osd_attr *attr)
 {
@@ -706,6 +718,7 @@ int extract_attr_from_ios(struct ore_io_state *ios, struct osd_attr *attr)
 
 	return -EIO;
 }
+EXPORT_SYMBOL(extract_attr_from_ios);
 
 static int _truncate_mirrors(struct ore_io_state *ios, unsigned cur_comp,
 			     struct osd_attr *attr)
@@ -815,6 +828,8 @@ int ore_truncate(struct ore_layout *layout, struct ore_components *comps,
 	ore_put_io_state(ios);
 	return ret;
 }
+EXPORT_SYMBOL(ore_truncate);
 
 const struct osd_attr g_attr_logical_length = ATTR_DEF(
 	OSD_APAGE_OBJECT_INFORMATION, OSD_ATTR_OI_LOGICAL_LENGTH, 8);
+EXPORT_SYMBOL(g_attr_logical_length);

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,8 @@`
`12`	`12`	`# Kbuild - Gets included from the Kernels Makefile and build system`
`13`	`13`	`#`
`14`	`14`
`15`		`-exofs-y := ore.o inode.o file.o symlink.o namei.o dir.o super.o`
	`15`	`+# ore module library`
	`16`	`+obj-$(CONFIG_ORE) += ore.o`
	`17`	`+`
	`18`	`+exofs-y := inode.o file.o symlink.o namei.o dir.o super.o`
`16`	`19`	`obj-$(CONFIG_EXOFS_FS) += exofs.o`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,10 @@`
`43`	`43`	`#define ORE_DBGMSG2(M...) do {} while (0)`
`44`	`44`	`/* #define ORE_DBGMSG2 ORE_DBGMSG */`
`45`	`45`
	`46`	`+MODULE_AUTHOR("Boaz Harrosh <bharrosh@panasas.com>");`
	`47`	`+MODULE_DESCRIPTION("Objects Raid Engine ore.ko");`
	`48`	`+MODULE_LICENSE("GPL");`
	`49`	`+`
`46`	`50`	`static u8 _ios_cred(struct ore_io_state ios, unsigned index)`
`47`	`51`	`{`
`48`	`52`	`return ios->comps->comps[index & ios->comps->single_comp].cred;`
`@@ -84,12 +88,14 @@ int ore_get_rw_state(struct ore_layout layout, struct ore_components comps,`
`84`	`88`	`*pios = ios;`
`85`	`89`	`return 0;`
`86`	`90`	`}`
	`91`	`+EXPORT_SYMBOL(ore_get_rw_state);`
`87`	`92`
`88`	`93`	`int ore_get_io_state(struct ore_layout layout, struct ore_components comps,`
`89`	`94`	`struct ore_io_state **ios)`
`90`	`95`	`{`
`91`	`96`	`return ore_get_rw_state(layout, comps, true, 0, 0, ios);`
`92`	`97`	`}`
	`98`	`+EXPORT_SYMBOL(ore_get_io_state);`
`93`	`99`
`94`	`100`	`void ore_put_io_state(struct ore_io_state *ios)`
`95`	`101`	`{`
`@@ -108,6 +114,7 @@ void ore_put_io_state(struct ore_io_state *ios)`
`108`	`114`	`kfree(ios);`
`109`	`115`	`}`
`110`	`116`	`}`
	`117`	`+EXPORT_SYMBOL(ore_put_io_state);`
`111`	`118`
`112`	`119`	`static void _sync_done(struct ore_io_state ios, void p)`
`113`	`120`	`{`
`@@ -236,6 +243,7 @@ int ore_check_io(struct ore_io_state ios, u64 resid)`
`236`	`243`
`237`	`244`	`return acumulated_lin_err;`
`238`	`245`	`}`
	`246`	`+EXPORT_SYMBOL(ore_check_io);`
`239`	`247`
`240`	`248`	`/*`
`241`	`249`	`* L - logical offset into the file`
`@@ -487,6 +495,7 @@ int ore_create(struct ore_io_state *ios)`
`487`	`495`	`out:`
`488`	`496`	`return ret;`
`489`	`497`	`}`
	`498`	`+EXPORT_SYMBOL(ore_create);`
`490`	`499`
`491`	`500`	`int ore_remove(struct ore_io_state *ios)`
`492`	`501`	`{`
`@@ -511,6 +520,7 @@ int ore_remove(struct ore_io_state *ios)`
`511`	`520`	`out:`
`512`	`521`	`return ret;`
`513`	`522`	`}`
	`523`	`+EXPORT_SYMBOL(ore_remove);`
`514`	`524`
`515`	`525`	`static int _write_mirror(struct ore_io_state *ios, int cur_comp)`
`516`	`526`	`{`
`@@ -617,6 +627,7 @@ int ore_write(struct ore_io_state *ios)`
`617`	`627`	`ret = ore_io_execute(ios);`
`618`	`628`	`return ret;`
`619`	`629`	`}`
	`630`	`+EXPORT_SYMBOL(ore_write);`
`620`	`631`
`621`	`632`	`static int _read_mirror(struct ore_io_state *ios, unsigned cur_comp)`
`622`	`633`	`{`
`@@ -685,6 +696,7 @@ int ore_read(struct ore_io_state *ios)`
`685`	`696`	`ret = ore_io_execute(ios);`
`686`	`697`	`return ret;`
`687`	`698`	`}`
	`699`	`+EXPORT_SYMBOL(ore_read);`
`688`	`700`
`689`	`701`	`int extract_attr_from_ios(struct ore_io_state ios, struct osd_attr attr)`
`690`	`702`	`{`
`@@ -706,6 +718,7 @@ int extract_attr_from_ios(struct ore_io_state ios, struct osd_attr attr)`
`706`	`718`
`707`	`719`	`return -EIO;`
`708`	`720`	`}`
	`721`	`+EXPORT_SYMBOL(extract_attr_from_ios);`
`709`	`722`
`710`	`723`	`static int _truncate_mirrors(struct ore_io_state *ios, unsigned cur_comp,`
`711`	`724`	`struct osd_attr *attr)`
`@@ -815,6 +828,8 @@ int ore_truncate(struct ore_layout layout, struct ore_components comps,`
`815`	`828`	`ore_put_io_state(ios);`
`816`	`829`	`return ret;`
`817`	`830`	`}`
	`831`	`+EXPORT_SYMBOL(ore_truncate);`
`818`	`832`
`819`	`833`	`const struct osd_attr g_attr_logical_length = ATTR_DEF(`
`820`	`834`	`OSD_APAGE_OBJECT_INFORMATION, OSD_ATTR_OI_LOGICAL_LENGTH, 8);`
	`835`	`+EXPORT_SYMBOL(g_attr_logical_length);`