From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 17 Apr 2017 20:09:04 +0000 (-0400)
Subject: mds: use uint64_t for sum of exported inodes
X-Git-Tag: v12.0.3~38^2~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=efb11c6c92b194ad6092f2e6fab258d51c5e56a2;p=ceph.git

mds: use uint64_t for sum of exported inodes

An int is too likely to overflow.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index 65b698118b3f..f375c086ff09 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -1269,7 +1269,7 @@ void Migrator::export_go_synced(CDir *dir, uint64_t tid)
   // fill export message with cache data
   MExportDir *req = new MExportDir(dir->dirfrag(), it->second.tid);
   map<client_t,entity_inst_t> exported_client_map;
-  int num_exported_inodes = encode_export_dir(req->export_data,
+  uint64_t num_exported_inodes = encode_export_dir(req->export_data,
 					      dir,   // recur start point
 					      exported_client_map,
 					      now);
@@ -1430,12 +1430,12 @@ void Migrator::finish_export_inode(CInode *in, utime_t now, mds_rank_t peer,
 
 }
 
-int Migrator::encode_export_dir(bufferlist& exportbl,
+uint64_t Migrator::encode_export_dir(bufferlist& exportbl,
 				CDir *dir,
 				map<client_t,entity_inst_t>& exported_client_map,
 				utime_t now)
 {
-  int num_exported = 0;
+  uint64_t num_exported = 0;
 
   dout(7) << "encode_export_dir " << *dir << " " << dir->get_num_head_items() << " head items" << dendl;
   
diff --git a/src/mds/Migrator.h b/src/mds/Migrator.h
index 241faf0a64d6..3e1df9d43454 100644
--- a/src/mds/Migrator.h
+++ b/src/mds/Migrator.h
@@ -309,7 +309,7 @@ public:
 			        map<client_t,Capability::Import>& peer_imported);
 
 
-  int encode_export_dir(bufferlist& exportbl,
+  uint64_t encode_export_dir(bufferlist& exportbl,
 			CDir *dir,
 			map<client_t,entity_inst_t>& exported_client_map,
 			utime_t now);