Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff8fb335 authored by Goldwyn Rodrigues's avatar Goldwyn Rodrigues Committed by Linus Torvalds
Browse files

ocfs2: remove versioning information 



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.

Signed-off-by: default avatarGoldwyn Rodrigues <rgoldwyn@suse.com>
Acked-by: default avatarSunil Mushran <sunil.mushran@gmail.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Acked-by: default avatarJoel Becker <jlbec@evilplan.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 227d0066

fs/ocfs2/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line 
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
Original line number Diff line number Diff line
@@ -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 @@ static int __init init_o2nm(void) 


MODULE_AUTHOR("Oracle");

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("OCFS2 cluster management");



module_init(init_o2nm)

module_exit(exit_o2nm)

fs/ocfs2/cluster/ver.c

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
/* -*- 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

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
/* -*- 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 */