From: Sage Weil <sage@newdream.net>
Date: Mon, 13 Sep 2010 16:32:03 +0000 (-0700)
Subject: client: avoid trivial helper _readdir_add_dirent
X-Git-Tag: v0.22~177
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=778c0bd3a3ed92d247e25cf8429d8f9d51ac1e6b;p=ceph.git

client: avoid trivial helper _readdir_add_dirent
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index d5674290ee6f..7ad0dd401454 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -3851,15 +3851,6 @@ void Client::seekdir(DIR *dirp, loff_t offset)
 
 
 
-void Client::_readdir_add_dirent(DirResult *dirp, const string& name, Inode *in)
-{
-  struct stat st;
-  int stmask = fill_stat(in, &st);  
-  dirp->buffer->push_back(DirEntry(name, st, stmask));
-  dout(10) << "_readdir_add_dirent " << dirp << " added '" << name << "' -> " << in->ino
-	   << ", size now " << dirp->buffer->size() << dendl;
-}
-
 //struct dirent {
 //  ino_t          d_ino;       /* inode number */
 //  off_t          d_off;       /* offset to the next dirent */
@@ -3967,7 +3958,11 @@ int Client::_readdir_get_frag(DirResult *dirp)
       
       Inode *in = _ll_get_inode(ist.vino);
       dout(15) << "_readdir_get_frag " << dirp << "    " << dname << " to " << in->ino << dendl;
-      _readdir_add_dirent(dirp, dname, in);
+
+      // add to cached result list
+      struct stat st;
+      int stmask = fill_stat(in, &st);  
+      dirp->buffer->push_back(DirEntry(dname, st, stmask));
     }
 
     dirp->this_offset = dirp->next_offset;
diff --git a/src/client/Client.h b/src/client/Client.h
index 935b5640664c..a546041cb13b 100644
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -1139,7 +1139,6 @@ private:
 
   // some helpers
   int _opendir(Inode *in, DirResult **dirpp, int uid=-1, int gid=-1);
-  void _readdir_add_dirent(DirResult *dirp, const string& name, Inode *in);
   bool _readdir_have_frag(DirResult *dirp);
   void _readdir_next_frag(DirResult *dirp);
   void _readdir_rechoose_frag(DirResult *dirp);