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

Commit 5e5d7a22 authored by Pekka Enberg's avatar Pekka Enberg Committed by Linus Torvalds
Browse files

[PATCH] pipe: remove redundant fifo_poll abstraction 



Remove a redundant fifo_poll() abstraction from fs/pipe.c and adds a big
fat comment stating we set POLLERR for FIFOs too on Linux unlike most
Unices.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Cc: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9c45817f

fs/pipe.c

+7 −6
Original line number Diff line number Diff line
@@ -415,6 +415,10 @@ pipe_poll(struct file *filp, poll_table *wait) 


	if (filp->f_mode & FMODE_WRITE) {

		mask |= (nrbufs < PIPE_BUFFERS) ? POLLOUT | POLLWRNORM : 0;

		/*

		 * Most Unices do not set POLLERR for FIFOs but on Linux they

		 * behave exactly like pipes for poll().

		 */

		if (!PIPE_READERS(*inode))

			mask |= POLLERR;

	}
@@ -422,9 +426,6 @@ pipe_poll(struct file *filp, poll_table *wait) 
	return mask;

}



/* FIXME: most Unices do not set POLLERR for fifos */

#define fifo_poll pipe_poll



static int

pipe_release(struct inode *inode, int decr, int decw)

{
@@ -568,7 +569,7 @@ struct file_operations read_fifo_fops = { 
	.read		= pipe_read,

	.readv		= pipe_readv,

	.write		= bad_pipe_w,

	.poll		= fifo_poll,

	.poll		= pipe_poll,

	.ioctl		= pipe_ioctl,

	.open		= pipe_read_open,

	.release	= pipe_read_release,
@@ -580,7 +581,7 @@ struct file_operations write_fifo_fops = { 
	.read		= bad_pipe_r,

	.write		= pipe_write,

	.writev		= pipe_writev,

	.poll		= fifo_poll,

	.poll		= pipe_poll,

	.ioctl		= pipe_ioctl,

	.open		= pipe_write_open,

	.release	= pipe_write_release,
@@ -593,7 +594,7 @@ struct file_operations rdwr_fifo_fops = { 
	.readv		= pipe_readv,

	.write		= pipe_write,

	.writev		= pipe_writev,

	.poll		= fifo_poll,

	.poll		= pipe_poll,

	.ioctl		= pipe_ioctl,

	.open		= pipe_rdwr_open,

	.release	= pipe_rdwr_release,