Commit e9f1c6fc authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Fixed Client class headers

parent 92be5731
diff -uNr ceph-15.2.4/src/client/Client.cc ceph-15.2.4-arm32_fix/src/client/Client.cc 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/src/client/Client.cc 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-arm32_fix/src/client/Client.cc 2020-08-31 12:14:43.228362892 +0930 +++ ceph-15.2.4-arm32_fix/src/client/Client.cc 2020-09-08 08:14:52.404501135 +0930
@@ -10948,7 +10948,7 @@ @@ -10948,7 +10948,7 @@
ldout(cct, 20) << __func__ << " " << in << " " << in->ino << " -> " << in->ll_ref << dendl; ldout(cct, 20) << __func__ << " " << in << " " << in->ino << " -> " << in->ll_ref << dendl;
} }
...@@ -28,9 +28,30 @@ diff -uNr ceph-15.2.4/src/client/Client.cc ceph-15.2.4-arm32_fix/src/client/Clie ...@@ -28,9 +28,30 @@ diff -uNr ceph-15.2.4/src/client/Client.cc ceph-15.2.4-arm32_fix/src/client/Clie
{ {
std::lock_guard lock(client_lock); std::lock_guard lock(client_lock);
return _ll_forget(in, count); return _ll_forget(in, count);
diff -uNr ceph-15.2.4/src/client/Client.h ceph-15.2.4-arm32_fix/src/client/Client.h
--- ceph-15.2.4/src/client/Client.h 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-arm32_fix/src/client/Client.h 2020-09-08 08:19:52.091603922 +0930
@@ -1028,7 +1028,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);
@@ -1179,7 +1179,7 @@
int _lookup_parent(Inode *in, const UserPerm& perms, Inode **parent=NULL);
int _lookup_name(Inode *in, Inode *parent, const UserPerm& perms);
int _lookup_ino(inodeno_t ino, const UserPerm& perms, Inode **inode=NULL);
- bool _ll_forget(Inode *in, uint64_t count);
+ bool _ll_forget(Inode *in, size_t count);
uint32_t deleg_timeout = 0;
diff -uNr ceph-15.2.4/src/mds/PurgeQueue.h ceph-15.2.4-arm32_fix/src/mds/PurgeQueue.h 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/src/mds/PurgeQueue.h 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-arm32_fix/src/mds/PurgeQueue.h 2020-08-31 11:58:21.747481083 +0930 +++ ceph-15.2.4-arm32_fix/src/mds/PurgeQueue.h 2020-09-08 08:14:52.404501135 +0930
@@ -219,6 +219,6 @@ @@ -219,6 +219,6 @@
size_t purge_item_journal_size; size_t purge_item_journal_size;
......
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