From ae4538c2e24df982bca82b26c5049f4f11bdf0bf Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 2 Sep 2014 17:31:28 -0400 Subject: [PATCH] ecryptfs: ->f_op is never NULL commit c2e3f5d5f4620bb6568bc559f712ce80222e20cb upstream. Signed-off-by: Al Viro [ luis: 3.16-stable, just to make 6d65261a09ad ("eCryptfs: don't pass fs-specific ioctl commands through") a clean cherry-pick ] Signed-off-by: Luis Henriques --- fs/ecryptfs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c index a06ad2f7ed80a..de1111457b5ef 100644 --- a/fs/ecryptfs/file.c +++ b/fs/ecryptfs/file.c @@ -315,7 +315,7 @@ ecryptfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) struct file *lower_file = ecryptfs_file_to_lower(file); long rc = -ENOIOCTLCMD; - if (lower_file->f_op && lower_file->f_op->compat_ioctl) + if (lower_file->f_op->compat_ioctl) rc = lower_file->f_op->compat_ioctl(lower_file, cmd, arg); return rc; } -- 2.47.3