diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-11-30 14:39:29 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-11-30 14:39:29 +1100 |
| commit | 5f1c6d28cfcd11c9df67dad45992fd523727fe1e (patch) | |
| tree | 6d1e2ec57356653992937381cd3b5753b22f2ca4 /fs/xfs/xfs_dir2_readdir.c | |
| parent | b7b26110edf88bad41b87e96a9f0148bed5e2ff8 (diff) | |
| parent | acdda3aae146d9b69d30e9d8a32a8d8937055523 (diff) | |
Merge branch 'iomap-4.10-directio' into for-next
Diffstat (limited to 'fs/xfs/xfs_dir2_readdir.c')
| -rw-r--r-- | fs/xfs/xfs_dir2_readdir.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c index 29816981b50a..003a99b83bd8 100644 --- a/fs/xfs/xfs_dir2_readdir.c +++ b/fs/xfs/xfs_dir2_readdir.c @@ -677,7 +677,6 @@ xfs_readdir( args.dp = dp; args.geo = dp->i_mount->m_dir_geo; - xfs_ilock(dp, XFS_IOLOCK_SHARED); if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL) rval = xfs_dir2_sf_getdents(&args, ctx); else if ((rval = xfs_dir2_isblock(&args, &v))) @@ -686,7 +685,6 @@ xfs_readdir( rval = xfs_dir2_block_getdents(&args, ctx); else rval = xfs_dir2_leaf_getdents(&args, ctx, bufsize); - xfs_iunlock(dp, XFS_IOLOCK_SHARED); return rval; } |