Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57498f9c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ecryptfs-3.13-rc1-quiet-checkers' of... 

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

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
parents e48f88a3 2000f5be

fs/ecryptfs/file.c

+2 −6
Original line number Diff line number Diff line
@@ -313,11 +313,9 @@ static int ecryptfs_fasync(int fd, struct file *file, int flag) 
static long

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;



	if (ecryptfs_file_to_private(file))

		lower_file = ecryptfs_file_to_lower(file);

	if (lower_file->f_op->unlocked_ioctl)

		rc = lower_file->f_op->unlocked_ioctl(lower_file, cmd, arg);

	return rc;
@@ -327,11 +325,9 @@ ecryptfs_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
static long

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;



	if (ecryptfs_file_to_private(file))

		lower_file = ecryptfs_file_to_lower(file);

	if (lower_file->f_op && lower_file->f_op->compat_ioctl)

		rc = lower_file->f_op->compat_ioctl(lower_file, cmd, arg);

	return rc;