Skip to content

GitLab

C
ceph
Commit f0dec7a3 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Fixed type mismatch in DiffRequest.cc

parent ab6753e8
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 11 deletions
ceph-15.2.15-arm32_fix.patch
View file @ f0dec7a3
diff -uNr ceph-15.2.15/src/client/Client.cc ceph-15.2.15-arm32_fix/src/client/Client.cc diff -uNr ceph-15.2.15/src/client/Client.cc ceph-15.2.15-arm32_fix/src/client/Client.cc
--- ceph-15.2.15/src/client/Client.cc 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/client/Client.cc 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-arm32_fix/src/client/Client.cc 2022-01-19 15:17:16.401800360 +1030 +++ ceph-15.2.15-arm32_fix/src/client/Client.cc 2023-01-14 18:09:07.004551138 +1030
@@ -11059,7 +11059,7 @@ @@ -11059,7 +11059,7 @@
ldout(cct, 20) << __func__ << " " << in << " " << in->ino << " -> " << in->ll_ref << dendl; ldout(cct, 20) << __func__ << " " << in << " " << in->ino << " -> " << in->ll_ref << dendl;
} }
...@@ -30,7 +30,7 @@ diff -uNr ceph-15.2.15/src/client/Client.cc ceph-15.2.15-arm32_fix/src/client/Cl ...@@ -30,7 +30,7 @@ diff -uNr ceph-15.2.15/src/client/Client.cc ceph-15.2.15-arm32_fix/src/client/Cl
return _ll_forget(in, count); return _ll_forget(in, count);
diff -uNr ceph-15.2.15/src/client/Client.h ceph-15.2.15-arm32_fix/src/client/Client.h diff -uNr ceph-15.2.15/src/client/Client.h ceph-15.2.15-arm32_fix/src/client/Client.h
--- ceph-15.2.15/src/client/Client.h 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/client/Client.h 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-arm32_fix/src/client/Client.h 2022-01-19 15:19:18.126188954 +1030 +++ ceph-15.2.15-arm32_fix/src/client/Client.h 2023-01-14 18:09:07.006551144 +1030
@@ -484,7 +484,7 @@ @@ -484,7 +484,7 @@
int ll_lookupx(Inode *parent, const char *name, Inode **out, int ll_lookupx(Inode *parent, const char *name, Inode **out,
struct ceph_statx *stx, unsigned want, unsigned flags, struct ceph_statx *stx, unsigned want, unsigned flags,
...@@ -60,7 +60,7 @@ diff -uNr ceph-15.2.15/src/client/Client.h ceph-15.2.15-arm32_fix/src/client/Cli ...@@ -60,7 +60,7 @@ diff -uNr ceph-15.2.15/src/client/Client.h ceph-15.2.15-arm32_fix/src/client/Cli
uint32_t deleg_timeout = 0; uint32_t deleg_timeout = 0;
diff -uNr ceph-15.2.15/src/client/fuse_ll.cc ceph-15.2.15-arm32_fix/src/client/fuse_ll.cc diff -uNr ceph-15.2.15/src/client/fuse_ll.cc ceph-15.2.15-arm32_fix/src/client/fuse_ll.cc
--- ceph-15.2.15/src/client/fuse_ll.cc 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/client/fuse_ll.cc 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-arm32_fix/src/client/fuse_ll.cc 2022-01-19 15:17:16.401800360 +1030 +++ ceph-15.2.15-arm32_fix/src/client/fuse_ll.cc 2023-01-14 18:09:07.006551144 +1030
@@ -192,7 +192,7 @@ @@ -192,7 +192,7 @@
} }
...@@ -72,7 +72,7 @@ diff -uNr ceph-15.2.15/src/client/fuse_ll.cc ceph-15.2.15-arm32_fix/src/client/f ...@@ -72,7 +72,7 @@ diff -uNr ceph-15.2.15/src/client/fuse_ll.cc ceph-15.2.15-arm32_fix/src/client/f
cfuse->client->ll_forget(cfuse->iget(ino), nlookup+1); cfuse->client->ll_forget(cfuse->iget(ino), nlookup+1);
diff -uNr ceph-15.2.15/src/common/options.h ceph-15.2.15-arm32_fix/src/common/options.h diff -uNr ceph-15.2.15/src/common/options.h ceph-15.2.15-arm32_fix/src/common/options.h
--- ceph-15.2.15/src/common/options.h 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/common/options.h 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-arm32_fix/src/common/options.h 2022-01-19 15:17:16.402800363 +1030 +++ ceph-15.2.15-arm32_fix/src/common/options.h 2023-01-14 18:09:07.007551147 +1030
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
case TYPE_ADDR: return "entity_addr_t"; case TYPE_ADDR: return "entity_addr_t";
case TYPE_ADDRVEC: return "entity_addrvec_t"; case TYPE_ADDRVEC: return "entity_addrvec_t";
...@@ -100,9 +100,21 @@ diff -uNr ceph-15.2.15/src/common/options.h ceph-15.2.15-arm32_fix/src/common/op ...@@ -100,9 +100,21 @@ diff -uNr ceph-15.2.15/src/common/options.h ceph-15.2.15-arm32_fix/src/common/op
case TYPE_SECS: case TYPE_SECS:
v = std::chrono::seconds{new_value}; break; v = std::chrono::seconds{new_value}; break;
default: default:
diff -uNr ceph-15.2.15/src/librbd/object_map/DiffRequest.cc ceph-15.2.15-arm32_fix/src/librbd/object_map/DiffRequest.cc
--- ceph-15.2.15/src/librbd/object_map/DiffRequest.cc 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-arm32_fix/src/librbd/object_map/DiffRequest.cc 2023-01-14 18:09:39.842649387 +1030
@@ -175,7 +175,7 @@
m_object_map.resize(num_objs);
}
- size_t prev_object_diff_state_size = m_object_diff_state->size();
+ uint64_t prev_object_diff_state_size = m_object_diff_state->size();
if (prev_object_diff_state_size < num_objs) {
// the diff state should be the largest of all snapshots in the set
m_object_diff_state->resize(num_objs);
diff -uNr ceph-15.2.15/src/mds/PurgeQueue.h ceph-15.2.15-arm32_fix/src/mds/PurgeQueue.h diff -uNr ceph-15.2.15/src/mds/PurgeQueue.h ceph-15.2.15-arm32_fix/src/mds/PurgeQueue.h
--- ceph-15.2.15/src/mds/PurgeQueue.h 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/mds/PurgeQueue.h 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-arm32_fix/src/mds/PurgeQueue.h 2022-01-19 15:17:16.402800363 +1030 +++ ceph-15.2.15-arm32_fix/src/mds/PurgeQueue.h 2023-01-14 18:09:07.007551147 +1030
@@ -219,6 +219,6 @@ @@ -219,6 +219,6 @@
size_t purge_item_journal_size; size_t purge_item_journal_size;
...@@ -113,7 +125,7 @@ diff -uNr ceph-15.2.15/src/mds/PurgeQueue.h ceph-15.2.15-arm32_fix/src/mds/Purge ...@@ -113,7 +125,7 @@ diff -uNr ceph-15.2.15/src/mds/PurgeQueue.h ceph-15.2.15-arm32_fix/src/mds/Purge
#endif #endif
diff -uNr ceph-15.2.15/src/pybind/mgr/cephadm/module.py ceph-15.2.15-arm32_fix/src/pybind/mgr/cephadm/module.py diff -uNr ceph-15.2.15/src/pybind/mgr/cephadm/module.py ceph-15.2.15-arm32_fix/src/pybind/mgr/cephadm/module.py
--- ceph-15.2.15/src/pybind/mgr/cephadm/module.py 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/pybind/mgr/cephadm/module.py 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-arm32_fix/src/pybind/mgr/cephadm/module.py 2022-01-19 15:17:16.402800363 +1030 +++ ceph-15.2.15-arm32_fix/src/pybind/mgr/cephadm/module.py 2023-01-14 18:09:07.008551150 +1030
@@ -342,7 +342,7 @@ @@ -342,7 +342,7 @@
raise RuntimeError("unable to read cephadm at '%s': %s" % ( raise RuntimeError("unable to read cephadm at '%s': %s" % (
path, str(e))) path, str(e)))
...@@ -125,7 +137,7 @@ diff -uNr ceph-15.2.15/src/pybind/mgr/cephadm/module.py ceph-15.2.15-arm32_fix/s ...@@ -125,7 +137,7 @@ diff -uNr ceph-15.2.15/src/pybind/mgr/cephadm/module.py ceph-15.2.15-arm32_fix/s
diff -uNr ceph-15.2.15/src/pybind/mgr/dashboard/frontend/package.json ceph-15.2.15-arm32_fix/src/pybind/mgr/dashboard/frontend/package.json diff -uNr ceph-15.2.15/src/pybind/mgr/dashboard/frontend/package.json ceph-15.2.15-arm32_fix/src/pybind/mgr/dashboard/frontend/package.json
--- ceph-15.2.15/src/pybind/mgr/dashboard/frontend/package.json 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/pybind/mgr/dashboard/frontend/package.json 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-arm32_fix/src/pybind/mgr/dashboard/frontend/package.json 2022-01-19 15:17:16.402800363 +1030 +++ ceph-15.2.15-arm32_fix/src/pybind/mgr/dashboard/frontend/package.json 2023-01-14 18:09:07.009551153 +1030
@@ -121,7 +121,6 @@ @@ -121,7 +121,6 @@
"@types/node": "12.12.34", "@types/node": "12.12.34",
"@types/simplebar": "5.1.1", "@types/simplebar": "5.1.1",
...@@ -136,7 +148,7 @@ diff -uNr ceph-15.2.15/src/pybind/mgr/dashboard/frontend/package.json ceph-15.2. ...@@ -136,7 +148,7 @@ diff -uNr ceph-15.2.15/src/pybind/mgr/dashboard/frontend/package.json ceph-15.2.
"jest": "25.5.4", "jest": "25.5.4",
diff -uNr ceph-15.2.15/src/test/common/test_json_formattable.cc ceph-15.2.15-arm32_fix/src/test/common/test_json_formattable.cc diff -uNr ceph-15.2.15/src/test/common/test_json_formattable.cc ceph-15.2.15-arm32_fix/src/test/common/test_json_formattable.cc
--- ceph-15.2.15/src/test/common/test_json_formattable.cc 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/test/common/test_json_formattable.cc 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-arm32_fix/src/test/common/test_json_formattable.cc 2022-01-19 15:17:16.402800363 +1030 +++ ceph-15.2.15-arm32_fix/src/test/common/test_json_formattable.cc 2023-01-14 18:09:07.009551153 +1030
@@ -371,7 +371,7 @@ @@ -371,7 +371,7 @@
struct2() { struct2() {
...@@ -148,7 +160,7 @@ diff -uNr ceph-15.2.15/src/test/common/test_json_formattable.cc ceph-15.2.15-arm ...@@ -148,7 +160,7 @@ diff -uNr ceph-15.2.15/src/test/common/test_json_formattable.cc ceph-15.2.15-arm
diff -uNr ceph-15.2.15/src/test/libcephfs/ceph_pthread_self.h ceph-15.2.15-arm32_fix/src/test/libcephfs/ceph_pthread_self.h diff -uNr ceph-15.2.15/src/test/libcephfs/ceph_pthread_self.h ceph-15.2.15-arm32_fix/src/test/libcephfs/ceph_pthread_self.h
--- ceph-15.2.15/src/test/libcephfs/ceph_pthread_self.h 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/test/libcephfs/ceph_pthread_self.h 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-arm32_fix/src/test/libcephfs/ceph_pthread_self.h 2022-01-19 15:17:16.403800366 +1030 +++ ceph-15.2.15-arm32_fix/src/test/libcephfs/ceph_pthread_self.h 2023-01-14 18:09:07.009551153 +1030
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
static_assert(std::is_convertible_v<decltype(me), uint64_t> || static_assert(std::is_convertible_v<decltype(me), uint64_t> ||
std::is_pointer_v<decltype(me)>, std::is_pointer_v<decltype(me)>,
...@@ -160,7 +172,7 @@ diff -uNr ceph-15.2.15/src/test/libcephfs/ceph_pthread_self.h ceph-15.2.15-arm32 ...@@ -160,7 +172,7 @@ diff -uNr ceph-15.2.15/src/test/libcephfs/ceph_pthread_self.h ceph-15.2.15-arm32
#endif #endif
diff -uNr ceph-15.2.15/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc ceph-15.2.15-arm32_fix/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc diff -uNr ceph-15.2.15/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc ceph-15.2.15-arm32_fix/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc
--- ceph-15.2.15/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-arm32_fix/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc 2022-01-19 15:17:16.403800366 +1030 +++ ceph-15.2.15-arm32_fix/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc 2023-01-14 18:09:07.009551153 +1030
@@ -162,7 +162,7 @@ @@ -162,7 +162,7 @@
int r) { int r) {
bufferlist bl; bufferlist bl;
...@@ -172,7 +184,7 @@ diff -uNr ceph-15.2.15/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher. ...@@ -172,7 +184,7 @@ diff -uNr ceph-15.2.15/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.
encode(images, out_bl); encode(images, out_bl);
diff -uNr ceph-15.2.15/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc ceph-15.2.15-arm32_fix/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc diff -uNr ceph-15.2.15/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc ceph-15.2.15-arm32_fix/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc
--- ceph-15.2.15/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-arm32_fix/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc 2022-01-19 15:17:16.403800366 +1030 +++ ceph-15.2.15-arm32_fix/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc 2023-01-14 18:09:07.010551156 +1030
@@ -253,7 +253,7 @@ @@ -253,7 +253,7 @@
json_spirit::mObject root_obj; json_spirit::mObject root_obj;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment