diff --git a/0002-change-default-devsl-from-0-to-4.patch b/0002-change-default-devsl-from-0-to-4.patch new file mode 100644 index 0000000000000000000000000000000000000000..6f48b78f4bfd6c8eb4edb1b0f733d9c5b9c808f3 --- /dev/null +++ b/0002-change-default-devsl-from-0-to-4.patch @@ -0,0 +1,42 @@ +From d37115e961f66357473e232a9591a6c5a803f9a6 Mon Sep 17 00:00:00 2001 +From: heppen +Date: Sat, 24 Jun 2023 18:09:33 +0800 +Subject: [PATCH] change default devsl from 0 to 4 + +--- + .../distributedfiledaemon/src/network/kernel_talker.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/services/distributedfiledaemon/src/network/kernel_talker.cpp b/services/distributedfiledaemon/src/network/kernel_talker.cpp +index bb53d50..8ee8dbb 100644 +--- a/services/distributedfiledaemon/src/network/kernel_talker.cpp ++++ b/services/distributedfiledaemon/src/network/kernel_talker.cpp +@@ -75,15 +75,13 @@ void KernelTalker::SinkSessionTokernel(shared_ptr session) + int socketFd = session->GetHandle(); + auto masterkey = session->GetKey(); + auto cid = session->GetCid(); +- LOGD("sink session to kernel success, cid:%{public}s, socketFd:%{public}d, key[0]:%{public}x", cid.c_str(), +- socketFd, *(uint32_t *)masterkey.data()); + + uint8_t status = (session->IsFromServer() ? SOCKET_STAT_ACCEPT : SOCKET_STAT_OPEN); + + UpdateSocketParam cmd = { + .cmd = CMD_UPDATE_SOCKET, + .newfd = socketFd, +- .devsl = 0, ++ .devsl = 4, + .status = status, + }; + if (memcpy_s(cmd.masterKey, KEY_MAX_LEN, masterkey.data(), KEY_MAX_LEN) != EOK) { +@@ -94,6 +92,8 @@ void KernelTalker::SinkSessionTokernel(shared_ptr session) + return; + } + SetCmd(cmd); ++ LOGD("sink session to kernel success, cid:%{public}s, socketFd:%{public}d, key[0]:%{public}x, devsl:%{public}d", ++ cid.c_str(), socketFd, *(uint32_t *)masterkey.data(), cmd.devsl); + + // DevslDispatcher::DevslGetRegister(cid, shared_from_this()); + } +-- +2.33.0 + diff --git a/dfs_service.spec b/dfs_service.spec index abdaeb7648d43a0ebfb9b3d906a9665ab174d49b..5def46214223251e176689514bef1e6b2ed3d420 100644 --- a/dfs_service.spec +++ b/dfs_service.spec @@ -5,12 +5,13 @@ Name: dfs_service Version: 1.0.0 -Release: 1 +Release: 2 Summary: The distributed file service. License: Apache License 2.0 Url: https://gitee.com/openharmony/filemanagement_dfs_service Source0: https://gitee.com/openharmony/filemanagement_dfs_service/repository/archive/%{openHarmony_source_release}.tar.gz #/filemanagement_dfs_service-%{openHarmony_source_release}.tar.gz Patch0: 0001-cut-access_token-common_event-ability.patch +Patch1: 0002-change-default-devsl-from-0-to-4.patch BuildRequires: distributed-build, libboundscheck, libatomic, distributed-utils Requires: libboundscheck, libatomic, distributed-utils @@ -33,6 +34,7 @@ cp -r %{_builddir}/build/openeuler/compiler_gn/* %{_builddir}/ %setup -q -T -a 0 -c -n %{dfs_service_dir} %patch0 -p1 -d %{dfs_service_dir}/dfs_service +%patch1 -p1 -d %{dfs_service_dir}/dfs_service %build @@ -49,13 +51,19 @@ rm -rf %{_builddir}/out %install install -d %{buildroot}/%{_libdir} +install -d %{buildroot}/system/lib64 # prepare so install -m 0755 %{_builddir}/out/openeuler/packages/phone/system/lib64/libdistributedfile*.so %{buildroot}/%{_libdir} +install -m 0755 %{_builddir}/out/openeuler/packages/phone/system/lib64/libdistributedfile*.so %{buildroot}/system/lib64 %files %{_libdir}/*.so +/system/lib64/*.so %changelog -* Sun Jun 18 2023 hepeng - 1.0.0-1 +* Sat Jun 24 2023 Peng He - 1.0.0-2 +- Change default devsl from 0 to 4. + +* Sun Jun 18 2023 Peng He - 1.0.0-1 - Cut access_token, common_event, ability.