Merge branch 'xfs-coccinelle-cleanups' into for-next

2014-12-01 09:03:02 +11:00
parent 216875a594 d254aaec5d
commit c14fc01340
5 changed files with 9 additions and 24 deletions
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -930,7 +930,6 @@ xfs_file_readdir(
 {
 	struct inode	*inode = file_inode(file);
 	xfs_inode_t	*ip = XFS_I(inode);
-	int		error;
 	size_t		bufsize;

 	/*
@@ -947,10 +946,7 @@ xfs_file_readdir(
 	 */
 	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