| From | Luis Henriques <> | Subject | [PATCH 3.16.y-ckt 072/165] ecryptfs: ->f_op is never NULL | Date | Wed, 25 Mar 2015 14:00:45 +0000 |
| |
3.16.7-ckt9 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <viro@zeniv.linux.org.uk>
commit c2e3f5d5f4620bb6568bc559f712ce80222e20cb upstream.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> [ 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 <luis.henriques@canonical.com> --- 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 a06ad2f7ed80..de1111457b5e 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; }
|