Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

[cascardo/linux.git] / fs / xfs / xfs_file.c

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index e2b1a81..13e974e 100644 (file)
--- 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