[Ocfs2-commits] manish commits r1164 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Mon Jun 21 17:29:45 CDT 2004
Author: manish
Date: 2004-06-21 16:29:43 -0500 (Mon, 21 Jun 2004)
New Revision: 1164
Modified:
trunk/src/super.c
Log:
cleanup read_super ifdef mess a little. Patch from Christoph Hellwig.
Modified: trunk/src/super.c
===================================================================
--- trunk/src/super.c 2004-06-21 21:12:59 UTC (rev 1163)
+++ trunk/src/super.c 2004-06-21 21:29:43 UTC (rev 1164)
@@ -301,11 +301,7 @@
return(status);
} /* ocfs_release_system_inodes */
-/*
- * __ocfs_read_super()
- *
- */
-static int __ocfs_read_super(struct super_block *sb, void *data, int silent)
+static int ocfs_fill_super(struct super_block *sb, void *data, int silent)
{
struct dentry *root;
int status;
@@ -374,17 +370,12 @@
LOG_EXIT_STATUS(status);
return status;
-} /* __ocfs_read_super */
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-static int ocfs_read_super (struct super_block *sb, void *data, int silent)
-{
- return __ocfs_read_super(sb, data, silent);
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
static struct super_block *ocfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data)
{
- return get_sb_bdev(fs_type, flags, dev_name, data, ocfs_read_super);
+ return get_sb_bdev(fs_type, flags, dev_name, data, ocfs_fill_super);
}
static struct file_system_type ocfs_fs_type = {
@@ -405,7 +396,7 @@
{
MOD_INC_USE_COUNT;
- if (__ocfs_read_super(sb, data, silent) < 0) {
+ if (ocfs_fill_super(sb, data, silent) < 0) {
MOD_DEC_USE_COUNT;
return NULL;
}
More information about the Ocfs2-commits
mailing list