[SCM] Samba Shared Repository - branch v4-15-test updated

[Jule Anger]

The branch, v4-15-test has been updated
       via  c1b4844f988 vfs_gpfs: Initialize litemask to 0
       via  95069631759 builtools: Make abi_gen.sh less prone to errors
      from  2f5c7c5621c vfs_shadow_copy2: remove async getxattrat

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-15-test


- Log -----------------------------------------------------------------
commit c1b4844f98801ef9d5a317ca3ff8b7bb8c29f47e
Author: Christof Schmitt <cs at samba.org>
Date:   Mon Mar 21 09:26:41 2022 -0700

    vfs_gpfs: Initialize litemask to 0
    
    The change from commit fb13c7c94f to query exact values for atime,
    mtime, ctime and size  is not necessary, as none of these are used in
    this codepath. Initiale litemask to 0 instead.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15027
    
    Signed-off-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Mon Mar 28 09:10:58 UTC 2022 on sn-devel-184
    
    (cherry picked from commit 127f728d58e79a42f8826500e3b15c486e88e556)
    
    Autobuild-User(v4-15-test): Jule Anger <janger at samba.org>
    Autobuild-Date(v4-15-test): Wed Mar 30 10:06:14 UTC 2022 on sn-devel-184

commit 95069631759c7a6833d57f5f90c852dd38d7bae7
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Feb 14 07:59:52 2022 +0100

    builtools: Make abi_gen.sh less prone to errors
    
    The mold linker has more hidden symbols and we would need to filter them out
    with nm, where objdump tells us which symbols are actually hidden. So we just
    need to filter out whatever is hidden.
    
    The use of awk makes it also easier to get what we want.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    (cherry picked from commit 2b9917d7a3cb88cf48517e4a93a94fa3ca6ff3d9)

-----------------------------------------------------------------------

Summary of changes:
 buildtools/scripts/abi_gen.sh | 9 +++++++--
 source3/modules/vfs_gpfs.c    | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/scripts/abi_gen.sh b/buildtools/scripts/abi_gen.sh
index 6dd6d321f77..ddb0a7cc36f 100755
--- a/buildtools/scripts/abi_gen.sh
+++ b/buildtools/scripts/abi_gen.sh
@@ -10,9 +10,14 @@ cat <<EOF
 set height 0
 set width 0
 EOF
-nm "$SHAREDLIB" | cut -d' ' -f2- | egrep '^[BDGTRVWS]' | grep -v @ | egrep -v ' (__bss_start|_edata|_init|_fini|_end)' | cut -c3- | sort | while read s; do
+
+# On older linker versions _init|_fini symbols are not hidden.
+objdump --dynamic-syms "${SHAREDLIB}" | \
+    awk '$0 !~ /.hidden/ {if ($2 == "g" && $3 ~ /D(F|O)/ && $4 ~ /(.bss|.rodata|.text)/) print $NF}' | \
+    sort | \
+    while read -r s; do
     echo "echo $s: "
-    echo p $s
+    echo p "${s}"
 done
 ) > $GDBSCRIPT
 
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 4d1cfa6075a..70b8c7b903e 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -1478,7 +1478,7 @@ static NTSTATUS vfs_gpfs_fget_dos_attributes(struct vfs_handle_struct *handle,
 	char buf[PATH_MAX];
 	const char *p = NULL;
 	struct gpfs_iattr64 iattr = { };
-	unsigned int litemask;
+	unsigned int litemask = 0;
 	struct timespec ts;
 	uint64_t file_id;
 	NTSTATUS status;
@@ -1984,7 +1984,7 @@ static int vfs_gpfs_check_pathref_fstat_x(struct gpfs_config_data *config,
 					  struct connection_struct *conn)
 {
 	struct gpfs_iattr64 iattr = {0};
-	unsigned int litemask;
+	unsigned int litemask = 0;
 	int saved_errno;
 	int fd;
 	int ret;


-- 
Samba Shared Repository