Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+2
-6
+2
-6
fs/ecryptfs/file.c
+2
-6
fs/ecryptfs/file.c
···
313
313
static long
314
314
ecryptfs_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
315
315
{
316
-
struct file *lower_file = NULL;
316
+
struct file *lower_file = ecryptfs_file_to_lower(file);
317
317
long rc = -ENOTTY;
318
318
319
-
if (ecryptfs_file_to_private(file))
320
-
lower_file = ecryptfs_file_to_lower(file);
321
319
if (lower_file->f_op->unlocked_ioctl)
322
320
rc = lower_file->f_op->unlocked_ioctl(lower_file, cmd, arg);
323
321
return rc;
···
325
327
static long
326
328
ecryptfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
327
329
{
328
-
struct file *lower_file = NULL;
330
+
struct file *lower_file = ecryptfs_file_to_lower(file);
329
331
long rc = -ENOIOCTLCMD;
330
332
331
-
if (ecryptfs_file_to_private(file))
332
-
lower_file = ecryptfs_file_to_lower(file);
333
333
if (lower_file->f_op && lower_file->f_op->compat_ioctl)
334
334
rc = lower_file->f_op->compat_ioctl(lower_file, cmd, arg);
335
335
return rc;