Commit ba833f14 authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman
Browse files

staging: lustre: libcfs: use dynamic minors for /dev/{lnet, obd} 



Request dynamic minor allocation when registering /dev/lnet and
/dev/obd.

Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-100086
Reviewed-on: https://review.whamcloud.com/29741


Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarJian Yu <jian.yu@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Reviewed-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2acf8359

drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
#include <linux/kernel.h>

#include <linux/kmod.h>

#include <linux/kthread.h>

#include <linux/miscdevice.h>

#include <linux/mm.h>

#include <linux/mm_inline.h>

#include <linux/module.h>

drivers/staging/lustre/include/uapi/linux/lnet/lnetctl.h

+0 −11
Original line number Diff line number Diff line
@@ -119,16 +119,5 @@ struct lnet_fault_stat { 


#define LNET_DEV_ID 0

#define LNET_DEV_PATH "/dev/lnet"

#define LNET_DEV_MAJOR 10

#define LNET_DEV_MINOR 240

#define OBD_DEV_ID 1

#define OBD_DEV_NAME "obd"

#define OBD_DEV_PATH "/dev/" OBD_DEV_NAME

#define OBD_DEV_MAJOR 10

#define OBD_DEV_MINOR 241

#define SMFS_DEV_ID  2

#define SMFS_DEV_PATH "/dev/snapdev"

#define SMFS_DEV_MAJOR 10

#define SMFS_DEV_MINOR 242



#endif

drivers/staging/lustre/include/uapi/linux/lustre/lustre_ioctl.h

+0 −2
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ enum md_echo_cmd { 
#define OBD_DEV_ID 1

#define OBD_DEV_NAME "obd"

#define OBD_DEV_PATH "/dev/" OBD_DEV_NAME

#define OBD_DEV_MAJOR 10

#define OBD_DEV_MINOR 241



#define OBD_IOCTL_VERSION	0x00010004

#define OBD_DEV_BY_DEVNAME	0xffffd0de

drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 
#include <linux/completion.h>

#include <linux/fs.h>

#include <linux/uaccess.h>

#include <linux/miscdevice.h>



# define DEBUG_SUBSYSTEM S_LNET

drivers/staging/lustre/lnet/libcfs/linux/linux-module.c

+2 −3
Original line number Diff line number Diff line
@@ -33,10 +33,9 @@ 


#define DEBUG_SUBSYSTEM S_LNET



#include <linux/miscdevice.h>

#include <linux/libcfs/libcfs.h>



#define LNET_MINOR 240



static inline size_t libcfs_ioctl_packlen(struct libcfs_ioctl_data *data)

{

	size_t len = sizeof(*data);
@@ -191,7 +190,7 @@ static const struct file_operations libcfs_fops = { 
};



struct miscdevice libcfs_dev = {

	.minor = LNET_MINOR,

	.minor = MISC_DYNAMIC_MINOR,

	.name = "lnet",

	.fops = &libcfs_fops,

};