Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 076c40f1 authored by Yan, Zheng's avatar Yan, Zheng Committed by Ilya Dryomov
Browse files

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: default avatarYan, Zheng <zyan@redhat.com>
parent 8974eebd

fs/ceph/dir.c

+0 −5
Original line number Diff line number Diff line
@@ -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: