浏览代码

xfs: fix simple_return.cocci warning in xfs_file_readdir

fs/xfs/xfs_file.c:919:1-6: WARNING: end returns can be simpified and declaration on line 902 can be dropped

 Simplify a trivial if-return sequence.  Possibly combine with a
 preceding function call.
Generated by: scripts/coccinelle/misc/simple_return.cocci

Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
kbuild test robot 10 年之前
父节点
当前提交
8300475ebf
共有 1 个文件被更改,包括 1 次插入5 次删除
  1. 1 5
      fs/xfs/xfs_file.c

+ 1 - 5
fs/xfs/xfs_file.c

@@ -933,7 +933,6 @@ xfs_file_readdir(
 {
 {
 	struct inode	*inode = file_inode(file);
 	struct inode	*inode = file_inode(file);
 	xfs_inode_t	*ip = XFS_I(inode);
 	xfs_inode_t	*ip = XFS_I(inode);
-	int		error;
 	size_t		bufsize;
 	size_t		bufsize;
 
 
 	/*
 	/*
@@ -950,10 +949,7 @@ xfs_file_readdir(
 	 */
 	 */
 	bufsize = (size_t)min_t(loff_t, 32768, ip->i_d.di_size);
 	bufsize = (size_t)min_t(loff_t, 32768, ip->i_d.di_size);
 
 
-	error = xfs_readdir(ip, ctx, bufsize);
-	if (error)
-		return error;
-	return 0;
+	return xfs_readdir(ip, ctx, bufsize);
 }
 }
 
 
 STATIC int
 STATIC int