added lf and iptables

1 files changed, 110 insertions, 0 deletions

diff --git a/skip/ceph/30-32bit_fix.patch.noauto b/skip/ceph/30-32bit_fix.patch.noauto
new file mode 100644
index 0000000..aba21d6
--- /dev/null
+++ b/skip/ceph/30-32bit_fix.patch.noauto
@@ -0,0 +1,110 @@
+32bit specific patches
+
+diff -uNr ceph-15.2.4/src/client/Client.cc ceph-15.2.4-arm32_fix/src/client/Client.cc
+--- ceph-15.2.4/src/client/Client.cc	2020-07-01 01:10:51.000000000 +0930
++++ ceph-15.2.4-arm32_fix/src/client/Client.cc	2020-11-21 22:11:16.061796876 +1030
+@@ -10948,7 +10948,7 @@
+   ldout(cct, 20) << __func__ << " " << in << " " << in->ino << " -> " << in->ll_ref << dendl;
+ }
+ 
+-int Client::_ll_put(Inode *in, uint64_t num)
++int Client::_ll_put(Inode *in, size_t num)
+ {
+   in->ll_put(num);
+   ldout(cct, 20) << __func__ << " " << in << " " << in->ino << " " << num << " -> " << in->ll_ref << dendl;
+@@ -10989,7 +10989,7 @@
+   }
+ }
+ 
+-bool Client::_ll_forget(Inode *in, uint64_t count)
++bool Client::_ll_forget(Inode *in, size_t count)
+ {
+   inodeno_t ino = in->ino;
+ 
+@@ -11018,7 +11018,7 @@
+   return last;
+ }
+ 
+-bool Client::ll_forget(Inode *in, uint64_t count)
++bool Client::ll_forget(Inode *in, size_t count)
+ {
+   std::lock_guard lock(client_lock);
+   return _ll_forget(in, count);
+diff -uNr ceph-15.2.4/src/mds/PurgeQueue.h ceph-15.2.4-arm32_fix/src/mds/PurgeQueue.h
+--- ceph-15.2.4/src/mds/PurgeQueue.h	2020-07-01 01:10:51.000000000 +0930
++++ ceph-15.2.4-arm32_fix/src/mds/PurgeQueue.h	2020-11-21 22:11:16.065796889 +1030
+@@ -219,6 +219,6 @@
+   size_t purge_item_journal_size;
+ 
+   uint64_t ops_high_water = 0;
+-  uint64_t files_high_water = 0;
++  size_t files_high_water = 0;
+ };
+ #endif
+diff -uNr ceph-15.2.4/src/test/common/test_json_formattable.cc ceph-15.2.4-arm32_fix/src/test/common/test_json_formattable.cc
+--- ceph-15.2.4/src/test/common/test_json_formattable.cc	2020-07-01 01:10:51.000000000 +0930
++++ ceph-15.2.4-arm32_fix/src/test/common/test_json_formattable.cc	2020-11-21 22:11:16.065796889 +1030
+@@ -371,7 +371,7 @@
+ 
+   struct2() {
+     void *p = (void *)this;
+-    long i = (long)p;
++    unsigned long i = (unsigned long)p;
+     v.resize((i >> 16) % 16 + 1);
+   }
+ 
+diff -uNr ceph-15.2.4/src/test/libcephfs/ceph_pthread_self.h ceph-15.2.4-arm32_fix/src/test/libcephfs/ceph_pthread_self.h
+--- ceph-15.2.4/src/test/libcephfs/ceph_pthread_self.h	2020-07-01 01:10:51.000000000 +0930
++++ ceph-15.2.4-arm32_fix/src/test/libcephfs/ceph_pthread_self.h	2020-11-21 22:11:16.066796893 +1030
+@@ -25,7 +25,7 @@
+   static_assert(std::is_convertible_v<decltype(me), uint64_t> ||
+                 std::is_pointer_v<decltype(me)>,
+                 "we need to use pthread_self() for the owner parameter");
+-  return reinterpret_cast<uint64_t>(me);
++  return reinterpret_cast<uint64_t>((uint64_t) me);
+ }
+ 
+ #endif
+diff -uNr ceph-15.2.4/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc ceph-15.2.4-arm32_fix/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc
+--- ceph-15.2.4/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc	2020-07-01 01:10:51.000000000 +0930
++++ ceph-15.2.4-arm32_fix/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc	2020-11-21 22:11:16.066796893 +1030
+@@ -162,7 +162,7 @@
+                          int r) {
+     bufferlist bl;
+     encode(last_image_id, bl);
+-    encode(static_cast<size_t>(1024), bl);
++    encode(static_cast<uint64_t>(1024), bl);
+ 
+     bufferlist out_bl;
+     encode(images, out_bl);
+diff -Nurp a/src/client/Client.h b/src/client/Client.h
+--- a/src/client/Client.h
++++ b/src/client/Client.h
+@@ -525,7 +525,7 @@
+   int ll_lookupx(Inode *parent, const char *name, Inode **out,
+ 			struct ceph_statx *stx, unsigned want, unsigned flags,
+ 			const UserPerm& perms);
+-  bool ll_forget(Inode *in, uint64_t count);
++  bool ll_forget(Inode *in, size_t count);
+   bool ll_put(Inode *in);
+   int ll_get_snap_ref(snapid_t snap);
+ 
+@@ -1241,7 +1241,7 @@
+   void _fragmap_remove_stopped_mds(Inode *in, mds_rank_t mds);
+ 
+   void _ll_get(Inode *in);
+-  int _ll_put(Inode *in, uint64_t num);
++  int _ll_put(Inode *in, size_t num);
+   void _ll_drop_pins();
+ 
+   Fh *_create_fh(Inode *in, int flags, int cmode, const UserPerm& perms);
+@@ -1405,7 +1405,7 @@
+   int _lookup_parent(Inode *in, const UserPerm& perms, Inode **parent=NULL);
+   int _lookup_name(Inode *in, Inode *parent, const UserPerm& perms);
+   int _lookup_vino(vinodeno_t ino, const UserPerm& perms, Inode **inode=NULL);
+-  bool _ll_forget(Inode *in, uint64_t count);
++  bool _ll_forget(Inode *in, size_t count);
+ 
+   void collect_and_send_metrics();
+   void collect_and_send_global_metrics();
+