lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BKL-Removal: convert pipe to use unlocked_ioctl too

Browse Source 
No BKL needed in pipe_ioctl

Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andi Kleen
2008-02-08 04:21:23 -08:00
committed by Linus Torvalds
parent de5c9edee7
commit d59d0b1b88
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fs/pipe.c
View File

@@ -576,9 +576,7 @@ bad_pipe_w(struct file *filp, const char __user *buf, size_t count,
return -EBADF; return -EBADF;
} }
static int static long pipe_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
pipe_ioctl(struct inode *pino, struct file *filp,
unsigned int cmd, unsigned long arg)
{ {
struct inode *inode = filp->f_path.dentry->d_inode; struct inode *inode = filp->f_path.dentry->d_inode;
struct pipe_inode_info *pipe; struct pipe_inode_info *pipe;
@@ -785,7 +783,7 @@ const struct file_operations read_fifo_fops = {
.aio_read = pipe_read, .aio_read = pipe_read,
.write = bad_pipe_w, .write = bad_pipe_w,
.poll = pipe_poll, .poll = pipe_poll,
.ioctl = pipe_ioctl, .unlocked_ioctl = pipe_ioctl,
.open = pipe_read_open, .open = pipe_read_open,
.release = pipe_read_release, .release = pipe_read_release,
.fasync = pipe_read_fasync, .fasync = pipe_read_fasync,
@@ -797,7 +795,7 @@ const struct file_operations write_fifo_fops = {
.write = do_sync_write, .write = do_sync_write,
.aio_write = pipe_write, .aio_write = pipe_write,
.poll = pipe_poll, .poll = pipe_poll,
.ioctl = pipe_ioctl, .unlocked_ioctl = pipe_ioctl,
.open = pipe_write_open, .open = pipe_write_open,
.release = pipe_write_release, .release = pipe_write_release,
.fasync = pipe_write_fasync, .fasync = pipe_write_fasync,
@@ -810,7 +808,7 @@ const struct file_operations rdwr_fifo_fops = {
.write = do_sync_write, .write = do_sync_write,
.aio_write = pipe_write, .aio_write = pipe_write,
.poll = pipe_poll, .poll = pipe_poll,
.ioctl = pipe_ioctl, .unlocked_ioctl = pipe_ioctl,
.open = pipe_rdwr_open, .open = pipe_rdwr_open,
.release = pipe_rdwr_release, .release = pipe_rdwr_release,
.fasync = pipe_rdwr_fasync, .fasync = pipe_rdwr_fasync,
@@ -822,7 +820,7 @@ static const struct file_operations read_pipe_fops = {
.aio_read = pipe_read, .aio_read = pipe_read,
.write = bad_pipe_w, .write = bad_pipe_w,
.poll = pipe_poll, .poll = pipe_poll,
.ioctl = pipe_ioctl, .unlocked_ioctl = pipe_ioctl,
.open = pipe_read_open, .open = pipe_read_open,
.release = pipe_read_release, .release = pipe_read_release,
.fasync = pipe_read_fasync, .fasync = pipe_read_fasync,
@@ -834,7 +832,7 @@ static const struct file_operations write_pipe_fops = {
.write = do_sync_write, .write = do_sync_write,
.aio_write = pipe_write, .aio_write = pipe_write,
.poll = pipe_poll, .poll = pipe_poll,
.ioctl = pipe_ioctl, .unlocked_ioctl = pipe_ioctl,
.open = pipe_write_open, .open = pipe_write_open,
.release = pipe_write_release, .release = pipe_write_release,
.fasync = pipe_write_fasync, .fasync = pipe_write_fasync,
@@ -847,7 +845,7 @@ static const struct file_operations rdwr_pipe_fops = {
.write = do_sync_write, .write = do_sync_write,
.aio_write = pipe_write, .aio_write = pipe_write,
.poll = pipe_poll, .poll = pipe_poll,
.ioctl = pipe_ioctl, .unlocked_ioctl = pipe_ioctl,
.open = pipe_rdwr_open, .open = pipe_rdwr_open,
.release = pipe_rdwr_release, .release = pipe_rdwr_release,
.fasync = pipe_rdwr_fasync, .fasync = pipe_rdwr_fasync,