ecryptfs: ->f_op is never NULL

Al Viro · Al Viro · commit bdd353661844 · 2013-11-09T22:19:48.000-05:00
Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
@@ -318,7 +318,7 @@ ecryptfs_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
 	if (ecryptfs_file_to_private(file))
 		lower_file = ecryptfs_file_to_lower(file);
-	if (lower_file->f_op && lower_file->f_op->unlocked_ioctl)
+	if (lower_file->f_op->unlocked_ioctl)
 		rc = lower_file->f_op->unlocked_ioctl(lower_file, cmd, arg);
 	return rc;
 }

Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ ecryptfs_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)`
`318`	`318`
`319`	`319`	`if (ecryptfs_file_to_private(file))`
`320`	`320`	`lower_file = ecryptfs_file_to_lower(file);`
`321`		`- if (lower_file->f_op && lower_file->f_op->unlocked_ioctl)`
	`321`	`+ if (lower_file->f_op->unlocked_ioctl)`
`322`	`322`	`rc = lower_file->f_op->unlocked_ioctl(lower_file, cmd, arg);`
`323`	`323`	`return rc;`
`324`	`324`	`}`