test: clean up some warnings

Signed-off-by: Christopher Hoffman <choffman@redhat.com>

diff --git a/src/client/Client.cc b/src/client/Client.cc
index dce0a7090056a573089ed7e051cec08f21c9291d..e0507ca72327e734c4d985243c8df41d99a0e8e7 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -11421,7 +11421,7 @@ success:
     // r is expected to hold value of effective bytes read.
     // in the case of fscrypt, this will be the logical size. So if all bytes read
     // is equal to read_len, then display logical size.
-    if (read_len == read) {
+    if ((int)read_len == read) {
       r = len;
     } else {
       r = read;

diff --git a/src/include/cephfs/libcephfs.h b/src/include/cephfs/libcephfs.h
index 33a9324d556a66639072ffdf006895797be1b6b4..833385d1e503fcd450273e6e4424eadbba9ebc6c 100644 (file)
--- a/src/include/cephfs/libcephfs.h
+++ b/src/include/cephfs/libcephfs.h
@@ -134,6 +134,7 @@ struct ceph_ll_io_info {
 
 struct ceph_fscrypt_key_identifier;
 struct fscrypt_policy_v2;
+struct fscrypt_remove_key_arg;
 
 /* setattr mask bits (up to an int in size) */
 #ifndef CEPH_SETATTR_MODE

diff --git a/src/test/libcephfs/fscrypt.cc b/src/test/libcephfs/fscrypt.cc
index b9aa2935db99fb70a3a53380ead39a5d51d39048..b076e512133a68c33e804ab15075773e78a86a30 100644 (file)
--- a/src/test/libcephfs/fscrypt.cc
+++ b/src/test/libcephfs/fscrypt.cc
@@ -175,7 +175,7 @@ int fscrypt_encrypt(const string& dir_path)
     return r;
   }
 
-  for (int i = 0; i < sizeof(fscrypt_key); ++i) {
+  for (int i = 0; i < (int)sizeof(fscrypt_key); ++i) {
     fscrypt_key[i] = (char)rand();
   }