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

Commit eb3d9989 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre: Remove lustre_build_version.h 



of the two macroses is contained the LUSTRE_RELEASE was unused and
BUILD_VERSION is too generically named and was replaced with
LUSTRE_VERSION_STRING with all the users (provided by lustre_ver.h)

With in-kernel client the build version should be combined with
kernel build information anyway.

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3f821732

drivers/staging/lustre/lustre/include/lustre/lustre_build_version.h

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
#define BUILD_VERSION "v2_3_64_0-g6e62c21-CHANGED-3.9.0"

#define LUSTRE_RELEASE 3.9.0_g6e62c21

drivers/staging/lustre/lustre/obdclass/class_obd.c

+5 −6
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include "../../include/linux/lnet/lnetctl.h"

#include "../include/lustre_debug.h"

#include "../include/lprocfs_status.h"

#include "../include/lustre/lustre_build_version.h"

#include <linux/list.h>

#include "../include/cl_object.h"

#include "llog_internal.h"
@@ -218,14 +217,14 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg) 
			goto out;

		}



		if (strlen(BUILD_VERSION) + 1 > data->ioc_inllen1) {

		if (strlen(LUSTRE_VERSION_STRING) + 1 > data->ioc_inllen1) {

			CERROR("ioctl buffer too small to hold version\n");

			err = -EINVAL;

			goto out;

		}



		memcpy(data->ioc_bulk, BUILD_VERSION,

		       strlen(BUILD_VERSION) + 1);

		memcpy(data->ioc_bulk, LUSTRE_VERSION_STRING,

		       strlen(LUSTRE_VERSION_STRING) + 1);



		err = obd_ioctl_popdata((void __user *)arg, data, len);

		if (err)
@@ -481,7 +480,7 @@ static int __init init_obdclass(void) 


	int lustre_register_fs(void);



	LCONSOLE_INFO("Lustre: Build Version: "BUILD_VERSION"\n");

	LCONSOLE_INFO("Lustre: Build Version: " LUSTRE_VERSION_STRING "\n");



	spin_lock_init(&obd_types_lock);

	obd_zombie_impexp_init();
@@ -579,7 +578,7 @@ static void cleanup_obdclass(void) 
}



MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");

MODULE_DESCRIPTION("Lustre Class Driver Build Version: " BUILD_VERSION);

MODULE_DESCRIPTION("Lustre Class Driver Build Version: " LUSTRE_VERSION_STRING);

MODULE_LICENSE("GPL");

MODULE_VERSION(LUSTRE_VERSION_STRING);

drivers/staging/lustre/lustre/obdclass/linux/linux-module.c

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ 
#include "../../include/obd_class.h"

#include "../../include/lprocfs_status.h"

#include "../../include/lustre_ver.h"

#include "../../include/lustre/lustre_build_version.h"



/* buffer MUST be at least the size of obd_ioctl_hdr */

int obd_ioctl_getdata(char **buf, int *len, void __user *arg)