Minor patches from svn

src/base/iobuf.cpp

@@ -213,7 +213,7 @@ size_t IOBuf::new_bigview_count() {
 }
 
 struct IOBuf::Block {
-    base::atomic<int32_t> nshared;
+    base::atomic<int> nshared;
     uint16_t size;
     uint16_t cap;
     Block* portal_next;
@@ -242,7 +242,7 @@ struct IOBuf::Block {
         }
     }
 
-    int32_t ref_count() const {
+    int ref_count() const {
         return nshared.load(base::memory_order_relaxed);
     }
 
@@ -253,7 +253,7 @@ struct IOBuf::Block {
 namespace iobuf {
 
 // for unit test
-int32_t block_shared_count(IOBuf::Block const* b) { return b->ref_count(); }
+int block_shared_count(IOBuf::Block const* b) { return b->ref_count(); }
 
 IOBuf::Block* get_portal_next(IOBuf::Block const* b) {
     return b->portal_next;

src/bvar/default_variables.cpp

@@ -245,7 +245,9 @@ static int get_fd_count(int limit) {
     for (base::FilePath name = fd_enum.Next();
          !name.empty() && count <= limit;
          name = fd_enum.Next(), ++count) {}
-    return count - 2/*. and ..*/ - 1/*opendir itself*/;
+    // FileEnumerator already filtered . and .., due to its implementation,
+    // the fd created by opendir is not counted as well.
+    return count;
 }
 
 extern PassiveStatus<int> g_fd_num;

src/bvar/passive_status.h

@@ -10,8 +10,6 @@
 
 namespace bvar {
 
-// TODO: naming should be consistent with Status<>
-
 // Display a updated-by-need value. This is done by passing in an user callback
 // which is called to produce the value.
 // Example: