git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/i915: Add debugfs file to clear FIFO underruns.
[sfrench/cifs-2.6.git]
/
fs
/
pipe.c
diff --git
a/fs/pipe.c
b/fs/pipe.c
index 0913aed7fd0de8b8b95dd13d6c27f29eebfb0c00..7b1954caf3885d1c24458aa3a1843802c0506a09 100644
(file)
--- a/
fs/pipe.c
+++ b/
fs/pipe.c
@@
-327,7
+327,7
@@
pipe_read(struct kiocb *iocb, struct iov_iter *to)
break;
}
if (do_wakeup) {
break;
}
if (do_wakeup) {
- wake_up_interruptible_sync_poll(&pipe->wait,
POLLOUT |
POLLWRNORM);
+ wake_up_interruptible_sync_poll(&pipe->wait,
EPOLLOUT | E
POLLWRNORM);
kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
}
pipe_wait(pipe);
kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
}
pipe_wait(pipe);
@@
-336,7
+336,7
@@
pipe_read(struct kiocb *iocb, struct iov_iter *to)
/* Signal writers asynchronously that there is more room. */
if (do_wakeup) {
/* Signal writers asynchronously that there is more room. */
if (do_wakeup) {
- wake_up_interruptible_sync_poll(&pipe->wait,
POLLOUT |
POLLWRNORM);
+ wake_up_interruptible_sync_poll(&pipe->wait,
EPOLLOUT | E
POLLWRNORM);
kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
}
if (ret > 0)
kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
}
if (ret > 0)
@@
-463,7
+463,7
@@
pipe_write(struct kiocb *iocb, struct iov_iter *from)
break;
}
if (do_wakeup) {
break;
}
if (do_wakeup) {
- wake_up_interruptible_sync_poll(&pipe->wait,
POLLIN |
POLLRDNORM);
+ wake_up_interruptible_sync_poll(&pipe->wait,
EPOLLIN | E
POLLRDNORM);
kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
do_wakeup = 0;
}
kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
do_wakeup = 0;
}
@@
-474,7
+474,7
@@
pipe_write(struct kiocb *iocb, struct iov_iter *from)
out:
__pipe_unlock(pipe);
if (do_wakeup) {
out:
__pipe_unlock(pipe);
if (do_wakeup) {
- wake_up_interruptible_sync_poll(&pipe->wait,
POLLIN |
POLLRDNORM);
+ wake_up_interruptible_sync_poll(&pipe->wait,
EPOLLIN | E
POLLRDNORM);
kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
}
if (ret > 0 && sb_start_write_trylock(file_inode(filp)->i_sb)) {
kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
}
if (ret > 0 && sb_start_write_trylock(file_inode(filp)->i_sb)) {
@@
-523,19
+523,19
@@
pipe_poll(struct file *filp, poll_table *wait)
nrbufs = pipe->nrbufs;
mask = 0;
if (filp->f_mode & FMODE_READ) {
nrbufs = pipe->nrbufs;
mask = 0;
if (filp->f_mode & FMODE_READ) {
- mask = (nrbufs > 0) ?
POLLIN |
POLLRDNORM : 0;
+ mask = (nrbufs > 0) ?
EPOLLIN | E
POLLRDNORM : 0;
if (!pipe->writers && filp->f_version != pipe->w_counter)
if (!pipe->writers && filp->f_version != pipe->w_counter)
- mask |= POLLHUP;
+ mask |=
E
POLLHUP;
}
if (filp->f_mode & FMODE_WRITE) {
}
if (filp->f_mode & FMODE_WRITE) {
- mask |= (nrbufs < pipe->buffers) ?
POLLOUT |
POLLWRNORM : 0;
+ mask |= (nrbufs < pipe->buffers) ?
EPOLLOUT | E
POLLWRNORM : 0;
/*
/*
- * Most Unices do not set POLLERR for FIFOs but on Linux they
+ * Most Unices do not set
E
POLLERR for FIFOs but on Linux they
* behave exactly like pipes for poll().
*/
if (!pipe->readers)
* behave exactly like pipes for poll().
*/
if (!pipe->readers)
- mask |= POLLERR;
+ mask |=
E
POLLERR;
}
return mask;
}
return mask;
@@
-568,7
+568,7
@@
pipe_release(struct inode *inode, struct file *file)
pipe->writers--;
if (pipe->readers || pipe->writers) {
pipe->writers--;
if (pipe->readers || pipe->writers) {
- wake_up_interruptible_sync_poll(&pipe->wait,
POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR |
POLLHUP);
+ wake_up_interruptible_sync_poll(&pipe->wait,
EPOLLIN | EPOLLOUT | EPOLLRDNORM | EPOLLWRNORM | EPOLLERR | E
POLLHUP);
kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
}
kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
}
@@
-936,7
+936,7
@@
static int fifo_open(struct inode *inode, struct file *filp)
if (!is_pipe && !pipe->writers) {
if ((filp->f_flags & O_NONBLOCK)) {
if (!is_pipe && !pipe->writers) {
if ((filp->f_flags & O_NONBLOCK)) {
- /* suppress POLLHUP until we have
+ /* suppress
E
POLLHUP until we have
* seen a writer */
filp->f_version = pipe->w_counter;
} else {
* seen a writer */
filp->f_version = pipe->w_counter;
} else {