diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-09-22 16:27:52 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-10-24 23:34:54 -0400 |
| commit | 72c2d53192004845cbc19cd8a30b3212a9288140 (patch) | |
| tree | 31fcd924438f03d5aa09d13ffd813fb153da37c3 /fs/select.c | |
| parent | 22bd002ee76aa7d7a3393f39d977f6c106153c60 (diff) | |
| download | linux-72c2d53192004845cbc19cd8a30b3212a9288140.tar.bz2 | |
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.c | 4 |
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) const struct file_operations *f_op; f_op = f.file->f_op; mask = DEFAULT_POLLMASK; - if (f_op && f_op->poll) { + if (f_op->poll) { wait_key_set(wait, in, out, bit, busy_flag); mask = (*f_op->poll)(f.file, wait); @@ -762,7 +762,7 @@ static inline unsigned int do_pollfd(struct pollfd *pollfd, poll_table *pwait, mask = POLLNVAL; if (f.file) { mask = DEFAULT_POLLMASK; - if (f.file->f_op && f.file->f_op->poll) { + if (f.file->f_op->poll) { pwait->_key = pollfd->events|POLLERR|POLLHUP; pwait->_key |= busy_flag; mask = f.file->f_op->poll(f.file, pwait); |