[lustre-devel] [PATCH 5/7] staging:lustre: simplify libcfs_psdev_[open|release]

Simmons, James A. simmonsja at ornl.gov
Fri Feb 12 23:16:02 UTC 2016


>> diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-module.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-module.c
>> index 33f6036..64f0fbf 100644
>> --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-module.c
>> +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-module.c
>> @@ -98,30 +98,22 @@ int libcfs_ioctl_popdata(void *arg, void *data, int size)
>>  static int
>>  libcfs_psdev_open(struct inode *inode, struct file *file)
>>  {
>> -	int    rc = 0;
>> -
>>  	if (!inode)
>>  		return -EINVAL;
>> -	if (libcfs_psdev_ops.p_open != NULL)
>> -		rc = libcfs_psdev_ops.p_open(0, NULL);
>> -	else
>> -		return -EPERM;
>> -	return rc;
>> +
>> +	try_module_get(THIS_MODULE);
>
>Note, code like this is racy and incorrect and never needed, please fix
>this up properly (hint, set the module in the file operations.)
>
>Again, if you ever see code with that line, it is incorrect.

So simple

static struct file_operations libcfs_fops = {
        .module  = THIS_MODULE,
        .unlocked_ioctl = libcfs_psdev_ioctl,
};

With the open and release deleted should do the trick then.



More information about the devel mailing list