1- From 08e19e66fab8280161495c81f688a330fc80e4f5 Mon Sep 17 00:00:00 2001
2- From: Kamil Trzcinski <
[email protected] >
3- Date: Fri, 25 Jul 2025 22:04:22 +0200
4- Subject: [PATCH] arm32
5-
6- ---
7- pbs-client/src/pxar/create.rs | 10 +++++-----
8- pbs-client/src/pxar/extract.rs | 4 ++--
9- pbs-client/src/pxar/metadata.rs | 4 ++--
10- pbs-config/src/acl.rs | 7 +++----
11- pbs-config/src/user.rs | 7 +++----
12- pbs-datastore/src/chunk_store.rs | 4 ++--
13- pbs-datastore/src/fixed_index.rs | 6 +++---
14- pbs-fuse-loop/src/fuse_loop.rs | 4 ++--
15- pbs-pxar-fuse/src/lib.rs | 12 ++++++------
16- 9 files changed, 28 insertions(+), 30 deletions(-)
17-
181diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs
19- index 7f605a61..4a1a16be 100644
202--- a/pbs-client/src/pxar/create.rs
213+++ b/pbs-client/src/pxar/create.rs
224@@ -79,7 +79,7 @@ fn detect_fs_type(fd: RawFd) -> Result<i64, Errno> {
@@ -65,7 +47,6 @@ index 7f605a61..4a1a16be 100644
6547 ..Default::default()
6648 };
6749diff --git a/pbs-client/src/pxar/extract.rs b/pbs-client/src/pxar/extract.rs
68- index c4d0085c..dad3cd2f 100644
6950--- a/pbs-client/src/pxar/extract.rs
7051+++ b/pbs-client/src/pxar/extract.rs
7152@@ -727,7 +727,7 @@ impl Extractor {
@@ -87,7 +68,6 @@ index c4d0085c..dad3cd2f 100644
8768 Err(nix::errno::Errno::EINTR) => true,
8869 Err(err) => return Err(err).context("error setting file size"),
8970diff --git a/pbs-client/src/pxar/metadata.rs b/pbs-client/src/pxar/metadata.rs
90- index d03cf7e2..bf71679f 100644
9171--- a/pbs-client/src/pxar/metadata.rs
9272+++ b/pbs-client/src/pxar/metadata.rs
9373@@ -45,10 +45,10 @@ fn timestamp_to_update_timespec(mtime: &pxar::format::StatxTimestamp) -> [libc::
@@ -104,10 +84,9 @@ index d03cf7e2..bf71679f 100644
10484 },
10585 ]
10686diff --git a/pbs-config/src/acl.rs b/pbs-config/src/acl.rs
107- index aca1f68f..671ca44c 100644
10887--- a/pbs-config/src/acl.rs
10988+++ b/pbs-config/src/acl.rs
110- @@ -731 ,8 +731 ,7 @@ pub fn cached_config() -> Result<Arc<AclTree>, Error> {
89+ @@ -737 ,8 +737 ,7 @@ pub fn cached_config() -> Result<Arc<AclTree>, Error> {
11190 let cache = CACHED_CONFIG.read().unwrap();
11291 if let Some(ref config) = cache.data {
11392 if let Some(stat) = stat {
@@ -117,7 +96,7 @@ index aca1f68f..671ca44c 100644
11796 return Ok(config.clone());
11897 }
11998 } else if cache.last_mtime == 0 && cache.last_mtime_nsec == 0 {
120- @@ -746 ,8 +745 ,8 @@ pub fn cached_config() -> Result<Arc<AclTree>, Error> {
99+ @@ -752 ,8 +751 ,8 @@ pub fn cached_config() -> Result<Arc<AclTree>, Error> {
121100
122101 let mut cache = CACHED_CONFIG.write().unwrap();
123102 if let Some(stat) = stat {
@@ -129,7 +108,6 @@ index aca1f68f..671ca44c 100644
129108 cache.data = Some(config.clone());
130109
131110diff --git a/pbs-config/src/user.rs b/pbs-config/src/user.rs
132- index 08d141e6..1bff3c4f 100644
133111--- a/pbs-config/src/user.rs
134112+++ b/pbs-config/src/user.rs
135113@@ -96,8 +96,7 @@ pub fn cached_config() -> Result<Arc<SectionConfigData>, Error> {
@@ -154,7 +132,6 @@ index 08d141e6..1bff3c4f 100644
154132 cache.data = Some(config.clone());
155133
156134diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs
157- index 3c59612b..0340d7f1 100644
158135--- a/pbs-datastore/src/chunk_store.rs
159136+++ b/pbs-datastore/src/chunk_store.rs
160137@@ -408,7 +408,7 @@ impl ChunkStore {
@@ -176,7 +153,6 @@ index 3c59612b..0340d7f1 100644
176153 status.still_bad += 1;
177154 } else {
178155diff --git a/pbs-datastore/src/fixed_index.rs b/pbs-datastore/src/fixed_index.rs
179- index 8d9173e8..ae79c045 100644
180156--- a/pbs-datastore/src/fixed_index.rs
181157+++ b/pbs-datastore/src/fixed_index.rs
182158@@ -111,7 +111,7 @@ impl FixedIndexReader {
@@ -207,7 +183,6 @@ index 8d9173e8..ae79c045 100644
207183 }?
208184 .as_ptr()
209185diff --git a/pbs-fuse-loop/src/fuse_loop.rs b/pbs-fuse-loop/src/fuse_loop.rs
210- index d55be3b0..711354bc 100644
211186--- a/pbs-fuse-loop/src/fuse_loop.rs
212187+++ b/pbs-fuse-loop/src/fuse_loop.rs
213188@@ -177,7 +177,7 @@ impl<R: AsyncRead + AsyncSeek + Unpin> FuseLoopSession<R> {
@@ -228,7 +203,6 @@ index d55be3b0..711354bc 100644
228203 stat
229204 }
230205diff --git a/pbs-pxar-fuse/src/lib.rs b/pbs-pxar-fuse/src/lib.rs
231- index 4322c06e..ccb0c17d 100644
232206--- a/pbs-pxar-fuse/src/lib.rs
233207+++ b/pbs-pxar-fuse/src/lib.rs
234208@@ -546,7 +546,7 @@ impl SessionImpl {
@@ -265,6 +239,3 @@ index 4322c06e..ccb0c17d 100644
265239 stat.st_ctime_nsec = metadata.stat.mtime.nanos as _;
266240 Ok(stat)
267241 }
268- - -
269- 2.39.2
270-
0 commit comments