diff options
| author | Yan, Zheng <zyan@redhat.com> | 2016-04-28 16:56:44 +0200 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2016-05-26 01:15:36 +0200 |
| commit | 076c40f18d10489e29c515bf5936952830df5e16 (patch) | |
| tree | 66e00b9a359dea0da628a92a5052d8b6f2c2099b /fs/ceph/dir.c | |
| parent | ceph: record 'offset' for each entry of readdir result (diff) | |
| download | linux-076c40f18d10489e29c515bf5936952830df5e16.tar.xz linux-076c40f18d10489e29c515bf5936952830df5e16.zip | |
ceph: don't forbid marking directory complete after forward seek
Forward seek within same frag does not update fi->last_name, it will
not affect contents of later readdir reply. So there is no need to
forbid marking directory complete
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Diffstat (limited to 'fs/ceph/dir.c')
| -rw-r--r-- | fs/ceph/dir.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index 6ae635605be5..e954ea2fb710 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -546,7 +546,6 @@ static loff_t ceph_dir_llseek(struct file *file, loff_t offset, int whence) { struct ceph_file_info *fi = file->private_data; struct inode *inode = file->f_mapping->host; - loff_t old_offset = ceph_make_fpos(fi->frag, fi->next_offset); loff_t retval; inode_lock(inode); @@ -573,10 +572,6 @@ static loff_t ceph_dir_llseek(struct file *file, loff_t offset, int whence) if (need_reset_readdir(fi, offset)) { dout("dir_llseek dropping %p content\n", file); reset_readdir(fi); - } else if (fpos_cmp(offset, old_offset) > 0) { - /* reset dir_release_count if we did a forward seek */ - fi->dir_release_count = 0; - fi->readdir_cache_idx = -1; } } out: |