RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-31 23:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #775 from ceph/wip-readdirend

Browse Source 
mds: fix readdir end check

Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-10-28 21:01:27 -07:00
commit 8b98166d09
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mds/Server.cc
View File

@ -2785,11 +2785,6 @@ void Server::handle_client_readdir(MDRequest *mdr)
assert(snapid == CEPH_NOSNAP || snaps->count(snapid)); // just checkin'!
}
// build dir contents
bufferlist dnbl;
CDir::map_t::iterator it = dir->begin();
unsigned max = req->head.args.readdir.max_entries;
if (!max)
max = dir->get_num_any(); // whatever, something big.
@ -2807,8 +2802,13 @@ void Server::handle_client_readdir(MDRequest *mdr)
int bytes_left = max_bytes - front_bytes;
bytes_left -= realm->get_snap_trace().length();
// build dir contents
bufferlist dnbl;
__u32 numfiles = 0;
while (it != dir->end() && numfiles < max) {
__u8 end = (dir->begin() == dir->end());
for (CDir::map_t::iterator it = dir->begin();
!end && numfiles < max;
end = (it == dir->end())) {
CDentry *dn = it->second;
++it;
@ -2897,7 +2897,6 @@ void Server::handle_client_readdir(MDRequest *mdr)
mdcache->lru.lru_touch(dn);
}
__u8 end = (it == dir->end());
__u8 complete = (end && offset_str.empty()); // FIXME: what purpose does this serve
// finish final blob