aboutsummaryrefslogtreecommitdiffstats
path: root/fs/select.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-09-22 16:27:52 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2013-10-24 23:34:54 -0400
commit72c2d53192004845cbc19cd8a30b3212a9288140 (patch)
tree31fcd924438f03d5aa09d13ffd813fb153da37c3 /fs/select.c
parent22bd002ee76aa7d7a3393f39d977f6c106153c60 (diff)
file->f_op is never NULL...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/select.c')
-rw-r--r--fs/select.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/select.c b/fs/select.c
index 35d4adc749d9..55278a36a658 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -455,7 +455,7 @@ int do_select(int n, fd_set_bits *fds, struct timespec *end_time)
455 const struct file_operations *f_op; 455 const struct file_operations *f_op;
456 f_op = f.file->f_op; 456 f_op = f.file->f_op;
457 mask = DEFAULT_POLLMASK; 457 mask = DEFAULT_POLLMASK;
458 if (f_op && f_op->poll) { 458 if (f_op->poll) {
459 wait_key_set(wait, in, out, 459 wait_key_set(wait, in, out,
460 bit, busy_flag); 460 bit, busy_flag);
461 mask = (*f_op->poll)(f.file, wait); 461 mask = (*f_op->poll)(f.file, wait);
@@ -762,7 +762,7 @@ static inline unsigned int do_pollfd(struct pollfd *pollfd, poll_table *pwait,
762 mask = POLLNVAL; 762 mask = POLLNVAL;
763 if (f.file) { 763 if (f.file) {
764 mask = DEFAULT_POLLMASK; 764 mask = DEFAULT_POLLMASK;
765 if (f.file->f_op && f.file->f_op->poll) { 765 if (f.file->f_op->poll) {
766 pwait->_key = pollfd->events|POLLERR|POLLHUP; 766 pwait->_key = pollfd->events|POLLERR|POLLHUP;
767 pwait->_key |= busy_flag; 767 pwait->_key |= busy_flag;
768 mask = f.file->f_op->poll(f.file, pwait); 768 mask = f.file->f_op->poll(f.file, pwait);