client: simplify 'offset in frag'

don't distinguish leftmost frag from other frags. always use 2 as
first entry's offset.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 6572c2a24ea2abec4c7eecef92a292c2cc72c762)

Signed-off-by: Greg Farnum <gfarnum@redhat.com

diff --git a/src/client/Client.cc b/src/client/Client.cc
index f2d9c4fdd0877d23d4f5897887dd5968f39a40de..0442051d789d28dec8c4f219b451372cc9c52aa2 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -1118,10 +1118,7 @@ void Client::insert_readdir_results(MetaRequest *request, MetaSession *session,
     if (fg != dst.frag) {
       ldout(cct, 10) << "insert_trace got new frag " << fg << " -> " << dst.frag << dendl;
       fg = dst.frag;
-      if (fg.is_leftmost())
-       readdir_offset = 2;
-      else
-       readdir_offset = 0;
+      readdir_offset = 2;
       readdir_start.clear();
     }
 
@@ -6851,8 +6848,6 @@ void Client::seekdir(dir_result_t *dirp, loff_t offset)
     d->release_count--;   // bump if we do a forward seek
 
   d->offset = offset;
-  if (!d->frag().is_leftmost() && d->next_offset == 2)
-    d->next_offset = 0;  // not 2 on non-leftmost frags!
 }
 
 
@@ -6968,10 +6963,7 @@ int Client::_readdir_get_frag(dir_result_t *dirp)
 
     if (fg != req->readdir_reply_frag) {
       fg = req->readdir_reply_frag;
-      if (fg.is_leftmost())
-       dirp->next_offset = 2;
-      else
-       dirp->next_offset = 0;
+      dirp->next_offset = 2;
       dirp->offset = dir_result_t::make_fpos(fg, dirp->next_offset);
     }
     dirp->buffer_frag = fg;
@@ -6982,10 +6974,7 @@ int Client::_readdir_get_frag(dir_result_t *dirp)
 
     if (req->readdir_end) {
       dirp->last_name.clear();
-      if (fg.is_rightmost())
-       dirp->next_offset = 2;
-      else
-       dirp->next_offset = 0;
+      dirp->next_offset = 2;
     } else {
       dirp->last_name = req->readdir_last_name;
       dirp->next_offset += req->readdir_num;