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

Commit 7eaae282 authored by KAMBAROV, ZAUR's avatar KAMBAROV, ZAUR Committed by Linus Torvalds
Browse files

[PATCH] coverity: fs/locks.c flp null check 



We're dereferencing `flp' and then we're testing it for NULLness.

Either the compiler accidentally saved us or the existing null-pointer checdk
is redundant.

This defect was found automatically by Coverity Prevent, a static analysis tool.

Signed-off-by: default avatarZaur Kambarov <zkambarov@coverity.com>
Cc: Matthew Wilcox <willy@debian.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8f96c956

fs/locks.c

+3 −1
Original line number Diff line number Diff line
@@ -1276,7 +1276,7 @@ int fcntl_getlease(struct file *filp) 
 */

static int __setlease(struct file *filp, long arg, struct file_lock **flp)

{

	struct file_lock *fl, **before, **my_before = NULL, *lease = *flp;

	struct file_lock *fl, **before, **my_before = NULL, *lease;

	struct dentry *dentry = filp->f_dentry;

	struct inode *inode = dentry->d_inode;

	int error, rdlease_count = 0, wrlease_count = 0;
@@ -1287,6 +1287,8 @@ static int __setlease(struct file *filp, long arg, struct file_lock **flp) 
	if (!flp || !(*flp) || !(*flp)->fl_lmops || !(*flp)->fl_lmops->fl_break)

		goto out;



	lease = *flp;



	error = -EAGAIN;

	if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0))

		goto out;