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

Commit 58ea91c0 authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Martin Schwidefsky
Browse files

[S390] avoid default_llseek in s390 drivers 



Use nonseekable_open for a couple of s390 device drivers. This avoids
the use of default_llseek function which has a dependency on the BKL.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent f73a2b03

arch/s390/hypfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static int hypfs_open(struct inode *inode, struct file *filp) 
		}

		mutex_unlock(&fs_info->lock);

	}

	return 0;

	return nonseekable_open(inode, filp);

}



static ssize_t hypfs_aio_read(struct kiocb *iocb, const struct iovec *iov,

arch/s390/kernel/debug.c

+1 −0
Original line number Diff line number Diff line
@@ -655,6 +655,7 @@ debug_open(struct inode *inode, struct file *file) 
	p_info->act_entry_offset = 0;

	file->private_data = p_info;

	debug_info_get(debug_info);

	nonseekable_open(inode, file);

out:

	mutex_unlock(&debug_mutex);

	return rc;

drivers/s390/char/fs3270.c

+1 −0
Original line number Diff line number Diff line
@@ -484,6 +484,7 @@ fs3270_open(struct inode *inode, struct file *filp) 
		raw3270_del_view(&fp->view);

		goto out;

	}

	nonseekable_open(inode, filp);

	filp->private_data = fp;

out:

	mutex_unlock(&fs3270_mutex);

drivers/s390/char/zcore.c

+2 −2
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ static int zcore_memmap_open(struct inode *inode, struct file *filp) 
	}

	kfree(chunk_array);

	filp->private_data = buf;

	return 0;

	return nonseekable_open(inode, filp);

}



static int zcore_memmap_release(struct inode *inode, struct file *filp)
@@ -473,7 +473,7 @@ static ssize_t zcore_reipl_write(struct file *filp, const char __user *buf, 


static int zcore_reipl_open(struct inode *inode, struct file *filp)

{

	return 0;

	return nonseekable_open(inode, filp);

}



static int zcore_reipl_release(struct inode *inode, struct file *filp)

drivers/s390/cio/chsc_sch.c

+1 −0
Original line number Diff line number Diff line
@@ -803,6 +803,7 @@ static long chsc_ioctl(struct file *filp, unsigned int cmd, 


static const struct file_operations chsc_fops = {

	.owner = THIS_MODULE,

	.open = nonseekable_open,

	.unlocked_ioctl = chsc_ioctl,

	.compat_ioctl = chsc_ioctl,

};