aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_file.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/xfs/xfs_file.c')
-rw-r--r--fs/xfs/xfs_file.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index eb596b419942..13e974e6a889 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -21,8 +21,6 @@
21#include "xfs_format.h" 21#include "xfs_format.h"
22#include "xfs_log_format.h" 22#include "xfs_log_format.h"
23#include "xfs_trans_resv.h" 23#include "xfs_trans_resv.h"
24#include "xfs_sb.h"
25#include "xfs_ag.h"
26#include "xfs_mount.h" 24#include "xfs_mount.h"
27#include "xfs_da_format.h" 25#include "xfs_da_format.h"
28#include "xfs_da_btree.h" 26#include "xfs_da_btree.h"
@@ -37,7 +35,6 @@
37#include "xfs_ioctl.h" 35#include "xfs_ioctl.h"
38#include "xfs_trace.h" 36#include "xfs_trace.h"
39#include "xfs_log.h" 37#include "xfs_log.h"
40#include "xfs_dinode.h"
41#include "xfs_icache.h" 38#include "xfs_icache.h"
42 39
43#include <linux/aio.h> 40#include <linux/aio.h>
@@ -933,7 +930,6 @@ xfs_file_readdir(
933{ 930{
934 struct inode *inode = file_inode(file); 931 struct inode *inode = file_inode(file);
935 xfs_inode_t *ip = XFS_I(inode); 932 xfs_inode_t *ip = XFS_I(inode);
936 int error;
937 size_t bufsize; 933 size_t bufsize;
938 934
939 /* 935 /*
@@ -950,10 +946,7 @@ xfs_file_readdir(
950 */ 946 */
951 bufsize = (size_t)min_t(loff_t, 32768, ip->i_d.di_size); 947 bufsize = (size_t)min_t(loff_t, 32768, ip->i_d.di_size);
952 948
953 error = xfs_readdir(ip, ctx, bufsize); 949 return xfs_readdir(ip, ctx, bufsize);
954 if (error)
955 return error;
956 return 0;
957} 950}
958 951
959STATIC int 952STATIC int