Remove versioning information v2
PATCH 1/1 Remove versioning information v2
The versioning information is confusing for end-users. The numbers are stuck at 1.5.0 when the tools version have moved to 1.8.2. Remove the versioning system in the OCFS2 modules and let the kernel version be the guide to debug issues.
Changes since v1:
* Added MODULE_DESCRIPTION
--- fs/ocfs2/Makefile | 1 - fs/ocfs2/cluster/Makefile | 2 +- fs/ocfs2/cluster/nodemanager.c | 4 +--- fs/ocfs2/cluster/ver.c | 42 ----------------------------------------- fs/ocfs2/cluster/ver.h | 31 ------------------------------ fs/ocfs2/dlm/Makefile | 2 +- fs/ocfs2/dlm/dlmdomain.c | 5 +---- fs/ocfs2/dlm/dlmver.c | 42 ----------------------------------------- fs/ocfs2/dlm/dlmver.h | 31 ------------------------------ fs/ocfs2/dlmfs/Makefile | 2 +- fs/ocfs2/dlmfs/dlmfs.c | 4 +--- fs/ocfs2/dlmfs/dlmfsver.c | 42 ----------------------------------------- fs/ocfs2/dlmfs/dlmfsver.h | 31 ------------------------------ fs/ocfs2/super.c | 4 +--- fs/ocfs2/ver.c | 43 ------------------------------------------ fs/ocfs2/ver.h | 31 ------------------------------ 16 files changed, 7 insertions(+), 310 deletions(-) delete mode 100644 fs/ocfs2/cluster/ver.c delete mode 100644 fs/ocfs2/cluster/ver.h delete mode 100644 fs/ocfs2/dlm/dlmver.c delete mode 100644 fs/ocfs2/dlm/dlmver.h delete mode 100644 fs/ocfs2/dlmfs/dlmfsver.c delete mode 100644 fs/ocfs2/dlmfs/dlmfsver.h delete mode 100644 fs/ocfs2/ver.c delete mode 100644 fs/ocfs2/ver.h
fs/ocfs2/Makefile +0 -1
@@ -38,7 +38,6 @@ ocfs2-objs := \ symlink.o \ sysfile.o \ uptodate.o \ - ver.o \ quota_local.o \ quota_global.o \ xattr.o \
fs/ocfs2/cluster/Makefile +1 -1
@@ -1,4 +1,4 @@ obj-$(CONFIG_OCFS2_FS) += ocfs2_nodemanager.o ocfs2_nodemanager-objs := heartbeat.o masklog.o sys.o nodemanager.o \ - quorum.o tcp.o netdebug.o ver.o + quorum.o tcp.o netdebug.o
fs/ocfs2/cluster/nodemanager.c +1 -3
@@ -29,7 +29,6 @@#include "heartbeat.h" #include "masklog.h" #include "sys.h" -#include "ver.h" /* for now we operate under the assertion that there can be only one * cluster active at a time. Changing this will require trickling
@@ -945,8 +944,6 @@ static int __init init_o2nm(void) {int ret =-1 ; -cluster_print_version (); - ret =o2hb_init ();if (ret) goto out;
@@ -984,6 +981,7 @@ out:MODULE_AUTHOR ("Oracle" );MODULE_LICENSE ("GPL" ); +MODULE_DESCRIPTION ("OCFS2 cluster management" );module_init (init_o2nm)module_exit (exit_o2nm)
fs/ocfs2/cluster/ver.c deleted +0 -42
42 lines not on this page · raw message
fs/ocfs2/cluster/ver.h deleted +0 -31
@@ -1,31 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; -*- -* vim: noexpandtab sw=8 ts=8 sts=0: -* -* ver.h -* -* Function prototypes -* -* Copyright (C) 2005 Oracle. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -* You should have received a copy of the GNU General Public -* License along with this program; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 021110-1307, USA. -*/ - -#ifndef O2CLUSTER_VER_H -#define O2CLUSTER_VER_H - -void cluster_print_version (void ); - -#endif /* O2CLUSTER_VER_H */
fs/ocfs2/dlm/Makefile +1 -1
@@ -3,5 +3,5 @@ ccflags-y := -Ifs/ocfs2 obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o ocfs2_dlm-objs := dlmdomain.o dlmdebug.o dlmthread.o dlmrecovery.o \ - dlmmaster.o dlmast.o dlmconvert.o dlmlock.o dlmunlock.o dlmver.o + dlmmaster.o dlmast.o dlmconvert.o dlmlock.o dlmunlock.o
fs/ocfs2/dlm/dlmdomain.c +1 -4
@@ -43,8 +43,6 @@#include "dlmdomain.h" #include "dlmdebug.h" -#include "dlmver.h" -#define MLOG_MASK_PREFIX (ML_DLM|ML_DLM_DOMAIN)#include "cluster/masklog.h"
@@ -2328,8 +2326,6 @@ static int __init dlm_init(void) {int status; -dlm_print_version (); - status =dlm_init_mle_cache ();if (status) {mlog (ML_ERROR ,"Could not create o2dlm_mle slabcache\n" );
@@ -2379,6 +2375,7 @@ static void __exit dlm_exit (void)MODULE_AUTHOR ("Oracle" );MODULE_LICENSE ("GPL" ); +MODULE_DESCRIPTION ("OCFS2 Distributed Lock Management" );module_init (dlm_init);module_exit (dlm_exit);
fs/ocfs2/dlm/dlmver.c deleted +0 -42
42 lines not on this page · raw message
fs/ocfs2/dlm/dlmver.h deleted +0 -31
@@ -1,31 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; -*- -* vim: noexpandtab sw=8 ts=8 sts=0: -* -* dlmfsver.h -* -* Function prototypes -* -* Copyright (C) 2005 Oracle. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -* You should have received a copy of the GNU General Public -* License along with this program; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 021110-1307, USA. -*/ - -#ifndef DLM_VER_H -#define DLM_VER_H - -void dlm_print_version (void ); - -#endif /* DLM_VER_H */
fs/ocfs2/dlmfs/Makefile +1 -1
@@ -2,4 +2,4 @@ ccflags-y := -Ifs/ocfs2 obj-$(CONFIG_OCFS2_FS) += ocfs2_dlmfs.o -ocfs2_dlmfs-objs := userdlm.o dlmfs.o dlmfsver.o +ocfs2_dlmfs-objs := userdlm.o dlmfs.o
fs/ocfs2/dlmfs/dlmfs.c +1 -3
@@ -49,7 +49,6 @@#include "stackglue.h" #include "userdlm.h" -#include "dlmfsver.h" #define MLOG_MASK_PREFIX ML_DLMFS#include "cluster/masklog.h"
@@ -644,8 +643,6 @@ static int __init init_dlmfs_fs(void)int status;int cleanup_inode =0 , cleanup_worker =0 ; -dlmfs_print_version (); - status =bdi_init (&dlmfs_backing_dev_info);if (status)return status;
@@ -701,6 +698,7 @@ static void __exit exit_dlmfs_fs(void)MODULE_AUTHOR ("Oracle" );MODULE_LICENSE ("GPL" ); +MODULE_DESCRIPTION ("OCFS2 DLM-Filesystem" );module_init (init_dlmfs_fs)module_exit (exit_dlmfs_fs)
fs/ocfs2/dlmfs/dlmfsver.c deleted +0 -42
42 lines not on this page · raw message
fs/ocfs2/dlmfs/dlmfsver.h deleted +0 -31
@@ -1,31 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; -*- -* vim: noexpandtab sw=8 ts=8 sts=0: -* -* dlmver.h -* -* Function prototypes -* -* Copyright (C) 2005 Oracle. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -* You should have received a copy of the GNU General Public -* License along with this program; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 021110-1307, USA. -*/ - -#ifndef DLMFS_VER_H -#define DLMFS_VER_H - -void dlmfs_print_version (void ); - -#endif /* DLMFS_VER_H */
fs/ocfs2/super.c +1 -3
@@ -68,7 +68,6 @@#include "super.h" #include "sysfile.h" #include "uptodate.h" -#include "ver.h" #include "xattr.h" #include "quota.h" #include "refcounttree.h"
@@ -90,6 +89,7 @@ static struct dentry *ocfs2_debugfs_root = NULL;MODULE_AUTHOR ("Oracle" );MODULE_LICENSE ("GPL" ); +MODULE_DESCRIPTION ("OCFS2 cluster file system" );struct mount_options {
@@ -1618,8 +1618,6 @@ static int __init ocfs2_init(void) {int status, i; -ocfs2_print_version (); -for (i =0 ; i <OCFS2_IOEND_WQ_HASH_SZ ; i++)init_waitqueue_head (&ocfs2__ioend_wq[i]);
fs/ocfs2/ver.c deleted +0 -43
43 lines not on this page · raw message
fs/ocfs2/ver.h deleted +0 -31
@@ -1,31 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; -*- -* vim: noexpandtab sw=8 ts=8 sts=0: -* -* ver.h -* -* Function prototypes -* -* Copyright (C) 2002, 2004 Oracle. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -* You should have received a copy of the GNU General Public -* License along with this program; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 021110-1307, USA. -*/ - -#ifndef OCFS2_VER_H -#define OCFS2_VER_H - -void ocfs2_print_version (void ); - -#endif /* OCFS2_VER_H */
Signature · 5 lines
1.8.4 -- Goldwyn
Joel Becker
maintainerPATCH 1/1 Remove versioning information v2
Quoted 10 lines · Goldwyn Rodrigues
The versioning information is confusing for end-users. The numbers are stuck at 1.5.0 when the tools version have moved to 1.8.2. Remove the versioning system in the OCFS2 modules and let the kernel version be the guide to debug issues.
Changes since v1:
* AddedMODULE_DESCRIPTIONSigned-off-by Goldwyn Rodrigues <[email protected]>Acked-by Sunil Mushran <[email protected]>
Quoted 534 lines
--- fs/ocfs2/Makefile | 1 - fs/ocfs2/cluster/Makefile | 2 +- fs/ocfs2/cluster/nodemanager.c | 4 +--- fs/ocfs2/cluster/ver.c | 42 ----------------------------------------- fs/ocfs2/cluster/ver.h | 31 ------------------------------ fs/ocfs2/dlm/Makefile | 2 +- fs/ocfs2/dlm/dlmdomain.c | 5 +---- fs/ocfs2/dlm/dlmver.c | 42 ----------------------------------------- fs/ocfs2/dlm/dlmver.h | 31 ------------------------------ fs/ocfs2/dlmfs/Makefile | 2 +- fs/ocfs2/dlmfs/dlmfs.c | 4 +--- fs/ocfs2/dlmfs/dlmfsver.c | 42 ----------------------------------------- fs/ocfs2/dlmfs/dlmfsver.h | 31 ------------------------------ fs/ocfs2/super.c | 4 +--- fs/ocfs2/ver.c | 43 ------------------------------------------ fs/ocfs2/ver.h | 31 ------------------------------ 16 files changed, 7 insertions(+), 310 deletions(-) delete mode 100644 fs/ocfs2/cluster/ver.c delete mode 100644 fs/ocfs2/cluster/ver.h delete mode 100644 fs/ocfs2/dlm/dlmver.c delete mode 100644 fs/ocfs2/dlm/dlmver.h delete mode 100644 fs/ocfs2/dlmfs/dlmfsver.c delete mode 100644 fs/ocfs2/dlmfs/dlmfsver.h delete mode 100644 fs/ocfs2/ver.c delete mode 100644 fs/ocfs2/ver.hfs/ocfs2/Makefile +0
-1@@ -38,7 +38,6 @@ ocfs2-objs := \ symlink.o \ sysfile.o \ uptodate.o \ - ver.o \ quota_local.o \ quota_global.o \ xattr.o \fs/ocfs2/cluster/Makefile +1
-1@@ -1,4 +1,4 @@ obj-$(CONFIG_OCFS2_FS) += ocfs2_nodemanager.o ocfs2_nodemanager-objs := heartbeat.o masklog.o sys.o nodemanager.o \ - quorum.o tcp.o netdebug.o ver.o + quorum.o tcp.o netdebug.ofs/ocfs2/cluster/nodemanager.c +1
-3@@ -29,7 +29,6 @@#include "heartbeat.h" #include "masklog.h" #include "sys.h" -#include "ver.h" /* for now we operate under the assertion that there can be only one * cluster active at a time. Changing this will require trickling @@ -945,8 +944,6 @@ static int __init init_o2nm(void) {int ret =-1 ; -cluster_print_version (); - ret =o2hb_init ();if (ret) goto out;@@ -984,6 +981,7 @@ out:MODULE_AUTHOR ("Oracle" );MODULE_LICENSE ("GPL" ); +MODULE_DESCRIPTION ("OCFS2 cluster management" );module_init (init_o2nm)module_exit (exit_o2nm)fs/ocfs2/cluster/ver.c deleted +0
-42@@ -1,42 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; -*- -* vim: noexpandtab sw=8 ts=8 sts=0: -* -* ver.c -* -* version string -* -* Copyright (C) 2002, 2005 Oracle. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -* You should have received a copy of the GNU General Public -* License along with this program; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 021110-1307, USA. -*/ - -#include <linux/module.h> -#include <linux/kernel.h> - -#include "ver.h" - -#define CLUSTER_BUILD_VERSION "1.5.0" - -#define VERSION_STR "OCFS2 Node Manager " CLUSTER_BUILD_VERSION - -void cluster_print_version (void ) -{ -printk (KERN_INFO "%s\n" ,VERSION_STR ); -} - -MODULE_DESCRIPTION (VERSION_STR ); - -MODULE_VERSION (CLUSTER_BUILD_VERSION );fs/ocfs2/cluster/ver.h deleted +0
-31@@ -1,31 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; -*- -* vim: noexpandtab sw=8 ts=8 sts=0: -* -* ver.h -* -* Function prototypes -* -* Copyright (C) 2005 Oracle. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -* You should have received a copy of the GNU General Public -* License along with this program; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 021110-1307, USA. -*/ - -#ifndef O2CLUSTER_VER_H -#define O2CLUSTER_VER_H - -void cluster_print_version (void ); - -#endif /* O2CLUSTER_VER_H */ fs/ocfs2/dlm/Makefile +1
-1@@ -3,5 +3,5 @@ ccflags-y := -Ifs/ocfs2 obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o ocfs2_dlm-objs := dlmdomain.o dlmdebug.o dlmthread.o dlmrecovery.o \ - dlmmaster.o dlmast.o dlmconvert.o dlmlock.o dlmunlock.o dlmver.o + dlmmaster.o dlmast.o dlmconvert.o dlmlock.o dlmunlock.ofs/ocfs2/dlm/dlmdomain.c +1
-4@@ -43,8 +43,6 @@#include "dlmdomain.h" #include "dlmdebug.h" -#include "dlmver.h" -#define MLOG_MASK_PREFIX (ML_DLM|ML_DLM_DOMAIN)#include "cluster/masklog.h" @@ -2328,8 +2326,6 @@ static int __init dlm_init(void) {int status; -dlm_print_version (); - status =dlm_init_mle_cache ();if (status) {mlog (ML_ERROR ,"Could not create o2dlm_mle slabcache\n" );@@ -2379,6 +2375,7 @@ static void __exit dlm_exit (void)MODULE_AUTHOR ("Oracle" );MODULE_LICENSE ("GPL" ); +MODULE_DESCRIPTION ("OCFS2 Distributed Lock Management" );module_init (dlm_init);module_exit (dlm_exit);fs/ocfs2/dlm/dlmver.c deleted +0
-42@@ -1,42 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; -*- -* vim: noexpandtab sw=8 ts=8 sts=0: -* -* dlmver.c -* -* version string -* -* Copyright (C) 2002, 2005 Oracle. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -* You should have received a copy of the GNU General Public -* License along with this program; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 021110-1307, USA. -*/ - -#include <linux/module.h> -#include <linux/kernel.h> - -#include "dlmver.h" - -#define DLM_BUILD_VERSION "1.5.0" - -#define VERSION_STR "OCFS2 DLM " DLM_BUILD_VERSION - -void dlm_print_version (void ) -{ -printk (KERN_INFO "%s\n" ,VERSION_STR ); -} - -MODULE_DESCRIPTION (VERSION_STR ); - -MODULE_VERSION (DLM_BUILD_VERSION );fs/ocfs2/dlm/dlmver.h deleted +0
-31@@ -1,31 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; -*- -* vim: noexpandtab sw=8 ts=8 sts=0: -* -* dlmfsver.h -* -* Function prototypes -* -* Copyright (C) 2005 Oracle. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -* You should have received a copy of the GNU General Public -* License along with this program; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 021110-1307, USA. -*/ - -#ifndef DLM_VER_H -#define DLM_VER_H - -void dlm_print_version (void ); - -#endif /* DLM_VER_H */ fs/ocfs2/dlmfs/Makefile +1
-1@@ -2,4 +2,4 @@ ccflags-y := -Ifs/ocfs2 obj-$(CONFIG_OCFS2_FS) += ocfs2_dlmfs.o -ocfs2_dlmfs-objs := userdlm.o dlmfs.o dlmfsver.o +ocfs2_dlmfs-objs := userdlm.o dlmfs.ofs/ocfs2/dlmfs/dlmfs.c +1
-3@@ -49,7 +49,6 @@#include "stackglue.h" #include "userdlm.h" -#include "dlmfsver.h" #define MLOG_MASK_PREFIX ML_DLMFS#include "cluster/masklog.h" @@ -644,8 +643,6 @@ static int __init init_dlmfs_fs(void)int status;int cleanup_inode =0 , cleanup_worker =0 ; -dlmfs_print_version (); - status =bdi_init (&dlmfs_backing_dev_info);if (status)return status;@@ -701,6 +698,7 @@ static void __exit exit_dlmfs_fs(void)MODULE_AUTHOR ("Oracle" );MODULE_LICENSE ("GPL" ); +MODULE_DESCRIPTION ("OCFS2 DLM-Filesystem" );module_init (init_dlmfs_fs)module_exit (exit_dlmfs_fs)fs/ocfs2/dlmfs/dlmfsver.c deleted +0
-42@@ -1,42 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; -*- -* vim: noexpandtab sw=8 ts=8 sts=0: -* -* dlmfsver.c -* -* version string -* -* Copyright (C) 2002, 2005 Oracle. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -* You should have received a copy of the GNU General Public -* License along with this program; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 021110-1307, USA. -*/ - -#include <linux/module.h> -#include <linux/kernel.h> - -#include "dlmfsver.h" - -#define DLM_BUILD_VERSION "1.5.0" - -#define VERSION_STR "OCFS2 DLMFS " DLM_BUILD_VERSION - -void dlmfs_print_version (void ) -{ -printk (KERN_INFO "%s\n" ,VERSION_STR ); -} - -MODULE_DESCRIPTION (VERSION_STR ); - -MODULE_VERSION (DLM_BUILD_VERSION );fs/ocfs2/dlmfs/dlmfsver.h deleted +0
-31@@ -1,31 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; -*- -* vim: noexpandtab sw=8 ts=8 sts=0: -* -* dlmver.h -* -* Function prototypes -* -* Copyright (C) 2005 Oracle. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -* You should have received a copy of the GNU General Public -* License along with this program; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 021110-1307, USA. -*/ - -#ifndef DLMFS_VER_H -#define DLMFS_VER_H - -void dlmfs_print_version (void ); - -#endif /* DLMFS_VER_H */ fs/ocfs2/super.c +1
-3@@ -68,7 +68,6 @@#include "super.h" #include "sysfile.h" #include "uptodate.h" -#include "ver.h" #include "xattr.h" #include "quota.h" #include "refcounttree.h" @@ -90,6 +89,7 @@ static struct dentry *ocfs2_debugfs_root = NULL;MODULE_AUTHOR ("Oracle" );MODULE_LICENSE ("GPL" ); +MODULE_DESCRIPTION ("OCFS2 cluster file system" );struct mount_options {@@ -1618,8 +1618,6 @@ static int __init ocfs2_init(void) {int status, i; -ocfs2_print_version (); -for (i =0 ; i <OCFS2_IOEND_WQ_HASH_SZ ; i++)init_waitqueue_head (&ocfs2__ioend_wq[i]);fs/ocfs2/ver.c deleted +0
-43@@ -1,43 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; -*- -* vim: noexpandtab sw=8 ts=8 sts=0: -* -* ver.c -* -* version string -* -* Copyright (C) 2002, 2005 Oracle. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -* You should have received a copy of the GNU General Public -* License along with this program; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 021110-1307, USA. -*/ - -#include <linux/module.h> -#include <linux/string.h> -#include <linux/kernel.h> - -#include "ver.h" - -#define OCFS2_BUILD_VERSION "1.5.0" - -#define VERSION_STR "OCFS2 " OCFS2_BUILD_VERSION - -void ocfs2_print_version (void ) -{ -printk (KERN_INFO "%s\n" ,VERSION_STR ); -} - -MODULE_DESCRIPTION (VERSION_STR ); - -MODULE_VERSION (OCFS2_BUILD_VERSION );fs/ocfs2/ver.h deleted +0
-31@@ -1,31 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; -*- -* vim: noexpandtab sw=8 ts=8 sts=0: -* -* ver.h -* -* Function prototypes -* -* Copyright (C) 2002, 2004 Oracle. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -* You should have received a copy of the GNU General Public -* License along with this program; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 021110-1307, USA. -*/ - -#ifndef OCFS2_VER_H -#define OCFS2_VER_H - -void ocfs2_print_version (void ); - -#endif /* OCFS2_VER_H */ Signature · 5 lines
1.8.4 -- Goldwyn
Signature · 6 lines
"The whole problem with the world is that fools and fanatics are always so certain of themselves, and wiser people so full of doubts." - Bertrand Russell http://www.jlbec.org/ jlbec at evilplan.org