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/ioctl.c

diff --git a/fs/ioctl.c b/fs/ioctl.c
index fd507fb..8ac3fad 100644
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -37,7 +37,7 @@
 {
 	int error = -ENOTTY;
 
-	if (!filp->f_op || !filp->f_op->unlocked_ioctl)
+	if (!filp->f_op->unlocked_ioctl)
 		goto out;
 
 	error = filp->f_op->unlocked_ioctl(filp, cmd, arg);
@@ -501,7 +501,7 @@
 
 	/* Did FASYNC state change ? */
 	if ((flag ^ filp->f_flags) & FASYNC) {
-		if (filp->f_op && filp->f_op->fasync)
+		if (filp->f_op->fasync)
 			/* fasync() adjusts filp->f_flags */
 			error = filp->f_op->fasync(fd, filp, on);
 		else