iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Signed-off-by: John 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: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: NeilBrown <neilb@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
John L. Hammond 2018-03-30 15:10:06 -04:00 committed by Greg Kroah-Hartman
parent 2acf8359b3
commit ba833f1457
8 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h
View File

@ -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>

11
drivers/staging/lustre/include/uapi/linux/lnet/lnetctl.h
View File

@ -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

2
drivers/staging/lustre/include/uapi/linux/lustre/lustre_ioctl.h
View File

@ -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

1
drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c
View File

@ -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

5
drivers/staging/lustre/lnet/libcfs/linux/linux-module.c
View File

@ -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,
};

1
drivers/staging/lustre/lnet/libcfs/module.c
View File

@ -30,6 +30,7 @@
* This file is part of Lustre, http://www.lustre.org/
* Lustre is a trademark of Sun Microsystems, Inc.
*/
#include <linux/miscdevice.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/mm.h>

6
drivers/staging/lustre/lustre/obdclass/class_obd.c
View File

@ -32,7 +32,9 @@
*/
#define DEBUG_SUBSYSTEM S_CLASS
# include <linux/atomic.h>
#include <linux/atomic.h>
#include <linux/miscdevice.h>
#include <obd_support.h>
#include <obd_class.h>
@ -462,7 +464,7 @@ static int __init obdclass_init(void)
err = misc_register(&obd_psdev);
if (err) {
CERROR("cannot register %d err %d\n", OBD_DEV_MINOR, err);
CERROR("cannot register OBD miscdevices: err %d\n", err);
return err;
}

3
drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
View File

@ -42,7 +42,6 @@
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/major.h>
#include <linux/sched.h>
#include <linux/lp.h>
#include <linux/slab.h>
@ -271,7 +270,7 @@ static const struct file_operations obd_psdev_fops = {
/* modules setup */
struct miscdevice obd_psdev = {
.minor = OBD_DEV_MINOR,
.minor = MISC_DYNAMIC_MINOR,
.name = OBD_DEV_NAME,
.fops = &obd_psdev_fops,
};