From bc275a53278589a53ab0e1903a3d9e7c640d0205 Mon Sep 17 00:00:00 2001 From: kyliwenchong Date: Tue, 9 Aug 2022 14:11:37 +0800 Subject: [PATCH] upcall-internal.c: fix debug log message (#3651) It was meant to print linked_inode, not inode. Fixes: #3647 Signed-off-by: Yaniv Kaul --- ...nternal.c-fix-debug-log-message-3651.patch | 30 +++++++++++++++++++ glusterfs.spec | 6 +++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0002-upcall-internal.c-fix-debug-log-message-3651.patch diff --git a/0002-upcall-internal.c-fix-debug-log-message-3651.patch b/0002-upcall-internal.c-fix-debug-log-message-3651.patch new file mode 100644 index 0000000..d27319b --- /dev/null +++ b/0002-upcall-internal.c-fix-debug-log-message-3651.patch @@ -0,0 +1,30 @@ +From 46c38878bfec3d4089cec193faef2a6cfec35463 Mon Sep 17 00:00:00 2001 +From: Yaniv Kaul +Date: Tue, 19 Jul 2022 07:45:03 +0300 +Subject: [PATCH] upcall-internal.c: fix debug log message (#3651) + +It was meant to print linked_inode, not inode. + +Fixes: #3647 +Signed-off-by: Yaniv Kaul + +--- + xlators/features/upcall/src/upcall-internal.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xlators/features/upcall/src/upcall-internal.c b/xlators/features/upcall/src/upcall-internal.c +index 978825f..83aca92 100644 +--- a/xlators/features/upcall/src/upcall-internal.c ++++ b/xlators/features/upcall/src/upcall-internal.c +@@ -500,7 +500,7 @@ upcall_cache_invalidate(call_frame_t *frame, xlator_t *this, client_t *client, + linked_inode = inode_find(inode->table, stbuf->ia_gfid); + if (linked_inode) { + gf_log("upcall", GF_LOG_DEBUG, +- "upcall_inode_ctx_get of linked inode (%p)", inode); ++ "upcall_inode_ctx_get of linked inode (%p)", linked_inode); + up_inode_ctx = upcall_inode_ctx_get(linked_inode, this); + } + } +-- +2.23.0 + diff --git a/glusterfs.spec b/glusterfs.spec index cd52f3a..9953fb5 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -3,7 +3,7 @@ Name: glusterfs Version: 7.0 -Release: 7 +Release: 8 License: GPLv2 and LGPLv3+ Summary: Aggregating distributed file system URL: http://docs.gluster.org/ @@ -12,6 +12,7 @@ Source7: glusterfsd.service Patch0: 0000-core-fix-memory-pool-management-races.patch Patch1: 0001-geo-rep-Fix-the-name-of-changelog-archive-file.patch +Patch2: 0002-upcall-internal.c-fix-debug-log-message-3651.patch BuildRequires: systemd bison flex gcc make libtool ncurses-devel readline-devel libattr-devel BuildRequires: libxml2-devel openssl-devel libaio-devel libacl-devel python3-devel git perl @@ -460,6 +461,9 @@ exit 0 %{_mandir}/man8/*gluster*.8* %changelog +* Tue Aug 9 2022 liwenchong - 7.0-8 +- fix debug log message + * Tue Jun 8 2021 yanglongkang - 7.0-7 - geo-rep fix the name of changelog archive file -- Gitee