commit 72c2d53192004845cbc19cd8a30b3212a9288140
author Al Viro <viro@zeniv.linux.org.uk> Sun Sep 22 16:27:52 2013 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Thu Oct 24 23:34:54 2013 -0400
tree 31fcd924438f03d5aa09d13ffd813fb153da37c3
parent 22bd002ee76aa7d7a3393f39d977f6c106153c60

file->f_op is never NULL...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/select.c

diff --git a/fs/select.c b/fs/select.c
index 35d4adc7..55278a3 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -455,7 +455,7 @@
 					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 @@
 		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);