summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-04-20 20:49:14 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2016-05-09 11:41:14 -0400
commit060ff688cadac398a17f09bd87b16fd0bf943899 (patch)
treed76d06031454656ac798d9153b9e957ac8d99d79
parent8cb0d2c1c7dea61e9b976cadedeae228f1180cbd (diff)
downloadlinux-stable-060ff688cadac398a17f09bd87b16fd0bf943899.tar.gz
linux-stable-060ff688cadac398a17f09bd87b16fd0bf943899.tar.bz2
linux-stable-060ff688cadac398a17f09bd87b16fd0bf943899.zip
lustre: don't need to lock inode in directory lseek
Note that lustre has its private mutex protecting directory pagecache; if they ever remove it, they'll need to be careful with PageChecked() use. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--drivers/staging/lustre/lustre/llite/dir.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
index e4c82883e580..7a0a67f3c4e7 100644
--- a/drivers/staging/lustre/lustre/llite/dir.c
+++ b/drivers/staging/lustre/lustre/llite/dir.c
@@ -1865,7 +1865,6 @@ static loff_t ll_dir_seek(struct file *file, loff_t offset, int origin)
int api32 = ll_need_32bit_api(sbi);
loff_t ret = -EINVAL;
- inode_lock(inode);
switch (origin) {
case SEEK_SET:
break;
@@ -1903,7 +1902,6 @@ static loff_t ll_dir_seek(struct file *file, loff_t offset, int origin)
goto out;
out:
- inode_unlock(inode);
return ret;
}
@@ -1922,7 +1920,7 @@ const struct file_operations ll_dir_operations = {
.open = ll_dir_open,
.release = ll_dir_release,
.read = generic_read_dir,
- .iterate = ll_readdir,
+ .iterate_shared = ll_readdir,
.unlocked_ioctl = ll_dir_ioctl,
.fsync = ll_fsync,
};