diff options
| author | Chunwei Chen <[email protected]> | 2016-05-18 14:30:20 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-05-20 11:09:16 -0700 |
| commit | 9baaa7deae45c8556dfd79b2011234da5cb37b3a (patch) | |
| tree | 604c0db0b143616bec811b4c3e724a97effa3333 /module/zfs/zpl_file.c | |
| parent | e42d46664e81136f3e9b7030fe77f0550e615c3f (diff) | |
Linux 4.7 compat: use iterate_shared for concurrent readdir
Register iterate_shared if it exists so the kernel will used shared
lock and allowing concurrent readdir.
Also, use shared lock when doing llseek with SEEK_DATA or SEEK_HOLE
to allow concurrent seeking.
Signed-off-by: Chunwei Chen <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #4664
Closes #4665
Diffstat (limited to 'module/zfs/zpl_file.c')
| -rw-r--r-- | module/zfs/zpl_file.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/module/zfs/zpl_file.c b/module/zfs/zpl_file.c index 36153cb90..4481237bc 100644 --- a/module/zfs/zpl_file.c +++ b/module/zfs/zpl_file.c @@ -93,7 +93,7 @@ zpl_iterate(struct file *filp, struct dir_context *ctx) return (error); } -#if !defined(HAVE_VFS_ITERATE) +#if !defined(HAVE_VFS_ITERATE) && !defined(HAVE_VFS_ITERATE_SHARED) static int zpl_readdir(struct file *filp, void *dirent, filldir_t filldir) { @@ -421,13 +421,13 @@ zpl_llseek(struct file *filp, loff_t offset, int whence) loff_t maxbytes = ip->i_sb->s_maxbytes; loff_t error; - spl_inode_lock(ip); + spl_inode_lock_shared(ip); cookie = spl_fstrans_mark(); error = -zfs_holey(ip, whence, &offset); spl_fstrans_unmark(cookie); if (error == 0) error = lseek_execute(filp, ip, offset, maxbytes); - spl_inode_unlock(ip); + spl_inode_unlock_shared(ip); return (error); } @@ -853,7 +853,9 @@ const struct file_operations zpl_file_operations = { const struct file_operations zpl_dir_file_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, -#ifdef HAVE_VFS_ITERATE +#ifdef HAVE_VFS_ITERATE_SHARED + .iterate_shared = zpl_iterate, +#elif defined(HAVE_VFS_ITERATE) .iterate = zpl_iterate, #else .readdir = zpl_readdir, |