iput() has already judged the incoming parameter, so there is no need to
repeat the judgment here.

Signed-off-by: Bang Li <libang.linuxer@gmail.com>
---
 fs/notify/fsnotify.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c
index 494f653efbc6..70a8516b78bc 100644
--- a/fs/notify/fsnotify.c
+++ b/fs/notify/fsnotify.c
@@ -70,8 +70,7 @@ static void fsnotify_unmount_inodes(struct super_block *sb)
 		spin_unlock(&inode->i_lock);
 		spin_unlock(&sb->s_inode_list_lock);
 
-		if (iput_inode)
-			iput(iput_inode);
+		iput(iput_inode);
 
 		/* for each watch, send FS_UNMOUNT and then remove it */
 		fsnotify_inode(inode, FS_UNMOUNT);
@@ -85,8 +84,7 @@ static void fsnotify_unmount_inodes(struct super_block *sb)
 	}
 	spin_unlock(&sb->s_inode_list_lock);
 
-	if (iput_inode)
-		iput(iput_inode);
+	iput(iput_inode);
 }
 
 void fsnotify_sb_delete(struct super_block *sb)
-- 
2.25.1

On Fri 11-03-22 23:12:40, Bang Li wrote:
> iput() has already judged the incoming parameter, so there is no need to
> repeat the judgment here.
> 
> Signed-off-by: Bang Li <libang.linuxer@gmail.com>

Thanks. I've applied the patch to my tree.

								Honza

> ---
>  fs/notify/fsnotify.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c
> index 494f653efbc6..70a8516b78bc 100644
> --- a/fs/notify/fsnotify.c
> +++ b/fs/notify/fsnotify.c
> @@ -70,8 +70,7 @@ static void fsnotify_unmount_inodes(struct super_block *sb)
>  		spin_unlock(&inode->i_lock);
>  		spin_unlock(&sb->s_inode_list_lock);
>  
> -		if (iput_inode)
> -			iput(iput_inode);
> +		iput(iput_inode);
>  
>  		/* for each watch, send FS_UNMOUNT and then remove it */
>  		fsnotify_inode(inode, FS_UNMOUNT);
> @@ -85,8 +84,7 @@ static void fsnotify_unmount_inodes(struct super_block *sb)
>  	}
>  	spin_unlock(&sb->s_inode_list_lock);
>  
> -	if (iput_inode)
> -		iput(iput_inode);
> +	iput(iput_inode);
>  }
>  
>  void fsnotify_sb_delete(struct super_block *sb)
> -- 
> 2.25.1
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR