lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'ecryptfs-3.13-rc1-quiet-checkers' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs

Browse Source 
Pull minor eCryptfs fix from Tyler Hicks:
 "Quiet static checkers by removing unneeded conditionals"

* tag 'ecryptfs-3.13-rc1-quiet-checkers' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  eCryptfs: file->private_data is always valid
This commit is contained in:
Linus Torvalds
2013-11-22 10:58:14 -08:00
parent e48f88a30d 2000f5beab
commit 57498f9cb9
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/ecryptfs/file.c
View File

@@ -313,11 +313,9 @@ static int ecryptfs_fasync(int fd, struct file *file, int flag)
static long static long
ecryptfs_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ecryptfs_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{ {
struct file *lower_file = NULL; struct file *lower_file = ecryptfs_file_to_lower(file);
long rc = -ENOTTY; long rc = -ENOTTY;
if (ecryptfs_file_to_private(file))
lower_file = ecryptfs_file_to_lower(file);
if (lower_file->f_op->unlocked_ioctl) if (lower_file->f_op->unlocked_ioctl)
rc = lower_file->f_op->unlocked_ioctl(lower_file, cmd, arg); rc = lower_file->f_op->unlocked_ioctl(lower_file, cmd, arg);
return rc; return rc;
@@ -327,11 +325,9 @@ ecryptfs_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
static long static long
ecryptfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ecryptfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{ {
struct file *lower_file = NULL; struct file *lower_file = ecryptfs_file_to_lower(file);
long rc = -ENOIOCTLCMD; long rc = -ENOIOCTLCMD;
if (ecryptfs_file_to_private(file))
lower_file = ecryptfs_file_to_lower(file);
if (lower_file->f_op && lower_file->f_op->compat_ioctl) if (lower_file->f_op && lower_file->f_op->compat_ioctl)
rc = lower_file->f_op->compat_ioctl(lower_file, cmd, arg); rc = lower_file->f_op->compat_ioctl(lower_file, cmd, arg);
return rc; return rc;