From: Yan, Zheng Date: Thu, 28 Apr 2016 14:56:44 +0000 (+0800) Subject: ceph: don't forbid marking directory complete after forward seek X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=076c40f18d10489e29c515bf5936952830df5e16;p=openwrt%2Fstaging%2Fblogic.git 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 --- 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: