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

Commit c0426cf7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: lustre: a typedef for 'struct miscdevice'??? 



Come on, that's just silly...

Anyway, remove the typedef and fix up the initializer to use named
fields, otherwise bad things might happen in the future.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0f1c743b

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

+0 −5
Original line number Diff line number Diff line
@@ -124,11 +124,6 @@ void libcfs_sock_release(socket_t *sock); 
/*

 * libcfs pseudo device operations

 *

 * struct psdev_t and

 * misc_register() and

 * misc_deregister() are declared in

 * libcfs/<os>/<os>-prim.h

 *

 * It's just draft now.

 */

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

+0 −14
Original line number Diff line number Diff line
@@ -78,20 +78,6 @@ 
#define NR_CPUS     1

#endif



/*

 * cache

 */



/*

 * IRQs

 */





/*

 * Pseudo device register

 */

typedef struct miscdevice		psdev_t;



/*

 * Sysctl register

 */

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

+4 −4
Original line number Diff line number Diff line
@@ -176,8 +176,8 @@ static struct file_operations libcfs_fops = { 
	release :       libcfs_psdev_release

};



psdev_t libcfs_dev = {

	LNET_MINOR,

	"lnet",

	&libcfs_fops

struct miscdevice libcfs_dev = {

	.minor = LNET_MINOR,

	.name = "lnet",

	.fops = &libcfs_fops,

};

drivers/staging/lustre/lustre/libcfs/module.c

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ MODULE_AUTHOR("Peter J. Braam <braam@clusterfs.com>"); 
MODULE_DESCRIPTION("Portals v3.1");

MODULE_LICENSE("GPL");



extern psdev_t libcfs_dev;

extern struct miscdevice libcfs_dev;

extern struct rw_semaphore cfs_tracefile_sem;

extern struct mutex cfs_trace_thread_mutex;

extern struct cfs_wi_sched *cfs_sched_rehash;

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

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg) 
	RETURN(err);

} /* class_handle_ioctl */



extern psdev_t obd_psdev;

extern struct miscdevice obd_psdev;



#define OBD_INIT_CHECK

int obd_init_checks(void)