From 1a2f0fcdda65035fb9ddc520d4e4f4ec7b222796 Mon Sep 17 00:00:00 2001 From: zhangxianting Date: Thu, 11 Apr 2024 10:49:53 +0800 Subject: [PATCH] fix build error --- dpu-utilities.spec | 7 +- ...i_ctime-to-__i_ctime-at-kernel-6.6.0.patch | 80 +++++++++++++++++++ 2 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 rename-i_ctime-to-__i_ctime-at-kernel-6.6.0.patch diff --git a/dpu-utilities.spec b/dpu-utilities.spec index d5e302e..756157f 100644 --- a/dpu-utilities.spec +++ b/dpu-utilities.spec @@ -1,7 +1,7 @@ Name: dpu-utilities Summary: openEuler dpu utilities Version: 1.5 -Release: 1 +Release: 2 License: GPL-2.0 Source: https://gitee.com/openeuler/dpu-utilities/repository/archive/v%{version}.tar.gz ExclusiveOS: linux @@ -13,6 +13,8 @@ Provides: %{name} = %{version}-%{release} %define kernel_version %(ver=`rpm -qa|grep kernel-devel`;echo ${ver#*kernel-devel-}) BuildRequires: kernel-devel >= 5.10, gcc, make, json-c-devel, glib2-devel +Patch0: rename-i_ctime-to-__i_ctime-at-kernel-6.6.0.patch + %description This package contains the software utilities on dpu. @@ -139,6 +141,9 @@ sed -i '/# product cut_conf/a\dpuos kiwi/minios/cfg_dpuos yes' /opt/imageT sed -i '//a\dpuos 1 rpm-dir euler_base' /opt/imageTailor/repos/RepositoryRule.conf %changelog +* Thu Apr 11 2024 zhangxianting 1.5-2 +- fix build error + * Thu Nov 23 2023 Guangxing Deng 1.5-1 - Upgrade dpu-utilities version to 1.5 diff --git a/rename-i_ctime-to-__i_ctime-at-kernel-6.6.0.patch b/rename-i_ctime-to-__i_ctime-at-kernel-6.6.0.patch new file mode 100644 index 0000000..99d4ff2 --- /dev/null +++ b/rename-i_ctime-to-__i_ctime-at-kernel-6.6.0.patch @@ -0,0 +1,80 @@ +From b66b5c1e7bde8297063429a828d8fbd7c2da7b68 Mon Sep 17 00:00:00 2001 +From: zhangxianting +Date: Thu, 11 Apr 2024 10:47:25 +0800 +Subject: [PATCH] rename i_ctime to __i_ctime at kernel 6.6.0 + +--- + qtfs/qtfs/proc.c | 2 +- + qtfs/qtfs/sb.c | 8 ++++---- + qtfs/qtfs_server/fsops.c | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/qtfs/qtfs/proc.c b/qtfs/qtfs/proc.c +index 70238ea..39761af 100644 +--- a/qtfs/qtfs/proc.c ++++ b/qtfs/qtfs/proc.c +@@ -161,7 +161,7 @@ struct dentry *qtfs_proc_lookup(struct inode *parent_inode, struct dentry *child + ii.i_ino = spath.dentry->d_inode->i_ino; + ii.atime = spath.dentry->d_inode->i_atime; + ii.mtime = spath.dentry->d_inode->i_mtime; +- ii.ctime = spath.dentry->d_inode->i_ctime; ++ ii.ctime = spath.dentry->d_inode->__i_ctime; + path_put(&spath); + + kfree(tmp); +diff --git a/qtfs/qtfs/sb.c b/qtfs/qtfs/sb.c +index 88a8265..4b8ca42 100644 +--- a/qtfs/qtfs/sb.c ++++ b/qtfs/qtfs/sb.c +@@ -1033,7 +1033,7 @@ static void qtfs_init_inode(struct super_block *sb, struct inode *inode, struct + inode->i_size = ii->i_size; + inode->i_atime = ii->atime; + inode->i_mtime = ii->mtime; +- inode->i_ctime = ii->ctime; ++ inode->__i_ctime = ii->ctime; + + if (S_ISLNK(inode->i_mode)) { + if (is_sb_proc(sb)) { +@@ -1186,7 +1186,7 @@ int qtfs_unlink(struct inode *dir, struct dentry *dentry) + qtfs_err("qtfs unlink %s failed, errno:%d\n", req->path, rsp->errno); + } else { + qtfs_info("qtfs unlink %s success\n", req->path); +- inode->i_ctime = dir->i_ctime; ++ inode->__i_ctime = dir->__i_ctime; + inode_dec_link_count(inode); + } + ret = rsp->errno; +@@ -1224,7 +1224,7 @@ int qtfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_d + error = rsp->errno; + goto err_end; + } +- inode->i_ctime = current_time(inode); ++ inode->__i_ctime = current_time(inode); + inode_inc_link_count(inode); + ihold(inode); + d_instantiate(new_dentry, inode); +@@ -1616,7 +1616,7 @@ static int qtfs_fill_super(struct super_block *sb, void *priv_data, int silent) + root_inode->i_op = &qtfs_inode_ops; + } + root_inode->i_fop = &qtfs_dir_ops; +- root_inode->i_atime = root_inode->i_mtime = root_inode->i_ctime = CURRENT_TIME(root_inode); ++ root_inode->i_atime = root_inode->i_mtime = root_inode->__i_ctime = CURRENT_TIME(root_inode); + + sb->s_xattr = qtfs_xattr_handlers; + err = super_setup_bdi(sb); +diff --git a/qtfs/qtfs_server/fsops.c b/qtfs/qtfs_server/fsops.c +index 038384c..2ef25a7 100644 +--- a/qtfs/qtfs_server/fsops.c ++++ b/qtfs/qtfs_server/fsops.c +@@ -121,7 +121,7 @@ static inline void qtfs_inode_info_fill(struct inode_info *ii, struct inode *ino + ii->i_size = inode->i_size; + ii->atime = inode->i_atime; + ii->mtime = inode->i_mtime; +- ii->ctime = inode->i_ctime; ++ ii->ctime = inode->__i_ctime; + ii->i_bytes = inode->i_bytes; + ii->i_blkbits = inode->i_blkbits; + ii->i_write_hint = inode->i_write_hint; +-- +2.33.0 + -- Gitee