Merge upstream libfuse fuse-3.18.2

# Conflicts:
#	.github/workflows/abicheck.yml
#	.github/workflows/checkpatch.yml
#	.github/workflows/codeql.yml
#	.github/workflows/codespell.yml
#	.github/workflows/iwyi-check.yml
#	.github/workflows/pr-ci.yml
#	AUTHORS
#	ChangeLog.rst
#	example/meson.build
#	example/passthrough.c
#	example/passthrough_hp.cc
#	include/fuse_common.h
#	lib/fuse.c
#	lib/fuse_i.h
#	lib/fuse_loop_mt.c
#	lib/fuse_lowlevel.c
#	lib/fuse_versionscript
#	lib/meson.build
#	lib/mount.c
#	lib/mount_bsd.c
#	lib/util.c
#	lib/util.h
#	meson.build
#	test/ci-build.sh
#	test/hello.c
#	test/meson.build
#	test/test_syscalls.c
#	test/test_write_cache.c
#	util/fusermount.c

Author: mchaarawi

.dir-locals.el

@@ -1,47 +1,64 @@
 ((python-mode . ((indent-tabs-mode . nil)))
- (autoconf-mode . ((indent-tabs-mode . t)))
- (c++-mode . ((c-file-style . "k&r")
-              (indent-tabs-mode . nil)
-              (c-basic-offset . 4)
-              (c-file-offsets .
-                              ((block-close . 0)
-                               (brace-list-close . 0)
-                               (brace-list-entry . 0)
-                               (brace-list-intro . +)
-                               (case-label . 0)
-                               (class-close . 0)
-                               (defun-block-intro . +)
-                               (defun-close . 0)
-                               (defun-open . 0)
-                               (else-clause . 0)
-                               (inclass . +)
-                               (label . 0)
-                               (statement . 0)
-                               (statement-block-intro . +)
-                               (statement-case-intro . +)
-                               (statement-cont . +)
-                               (substatement . +)
-                               (topmost-intro . 0)))))
- (c-mode . ((c-file-style . "stroustrup")
-	    (indent-tabs-mode . t)
-	    (tab-width . 8)
+ (c++-mode . ((c-file-style . "linux-kernel")
+              (c-basic-offset . 8)
+	      (c-label-minimum-indentation . 0)
+        (c-offsets-alist . (
+                (arglist-close         . c-lineup-arglist-tabs-only)
+                (arglist-cont-nonempty .
+                    (c-lineup-gcc-asm-reg c-lineup-arglist-tabs-only))
+                (arglist-intro         . +)
+                (brace-list-intro      . +)
+                (c                     . c-lineup-C-comments)
+                (case-label            . 0)
+                (comment-intro         . c-lineup-comment)
+                (cpp-define-intro      . +)
+                (cpp-macro             . -1000)
+                (cpp-macro-cont        . +)
+                (defun-block-intro     . +)
+                (else-clause           . 0)
+                (func-decl-cont        . +)
+                (inclass               . +)
+                (inher-cont            . c-lineup-multi-inher)
+                (knr-argdecl-intro     . 0)
+                (label                 . -1000)
+                (statement             . 0)
+                (statement-block-intro . +)
+                (statement-case-intro  . +)
+                (statement-cont        . +)
+                (substatement          . +)
+		))
+	(indent-tabs-mode . t)
+	(show-trailing-whitespace . t)
+	))
+ (c-mode . ((c-file-style . "linux-kernel")
 	    (c-basic-offset . 8)
-	    (c-file-offsets .
-			    ((block-close . 0)
-			     (brace-list-close . 0)
-			     (brace-list-entry . 0)
-			     (brace-list-intro . +)
-			     (case-label . 0)
-			     (class-close . 0)
-			     (defun-block-intro . +)
-			     (defun-close . 0)
-			     (defun-open . 0)
-			     (else-clause . 0)
-			     (inclass . +)
-			     (label . 0)
-			     (statement . 0)
-			     (statement-block-intro . +)
-			     (statement-case-intro . +)
-			     (statement-cont . +)
-			     (substatement . +)
-			     (topmost-intro . 0))))))
+	    (c-label-minimum-indentation . 0)
+	    (c-offsets-alist . (
+                (arglist-close         . c-lineup-arglist-tabs-only)
+                (arglist-cont-nonempty .
+                    (c-lineup-gcc-asm-reg c-lineup-arglist-tabs-only))
+                (arglist-intro         . +)
+                (brace-list-intro      . +)
+                (c                     . c-lineup-C-comments)
+                (case-label            . 0)
+                (comment-intro         . c-lineup-comment)
+                (cpp-define-intro      . +)
+                (cpp-macro             . -1000)
+                (cpp-macro-cont        . +)
+                (defun-block-intro     . +)
+                (else-clause           . 0)
+                (func-decl-cont        . +)
+                (inclass               . +)
+                (inher-cont            . c-lineup-multi-inher)
+                (knr-argdecl-intro     . 0)
+                (label                 . -1000)
+                (statement             . 0)
+                (statement-block-intro . +)
+                (statement-case-intro  . +)
+                (statement-cont        . +)
+                (substatement          . +)
+                ))
+	(indent-tabs-mode . t)
+	(show-trailing-whitespace . t)
+	))
+)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Debian]
+ - Version [e.g. 12]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/issue-report.md

@@ -26,18 +26,18 @@ jobs:
         if: runner.os == 'Linux'
         run: |
           sudo apt-get update
-          sudo apt-get -y install abigail-tools clang gcc
+          sudo apt-get -y install abigail-tools clang gcc liburing-dev libnuma-dev
 
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           path: current
 
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           path: previous
           ref: ${{ github.event.pull_request.base.ref }}
 
-      - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: '3.12'
 
@@ -59,7 +59,8 @@ jobs:
       - name: Run abidiff
         run: abidiff
           --no-added-syms
-          --headers-dir1 previous/include/ 
-          --headers-dir2 current/include/ 
-          previous/build/lib/libfused.so 
-          current/build/lib/libfused.so
+          --suppressions current/.github/workflows/abidiff_suppressions.abignore
+          --headers-dir1 previous/include/
+          --headers-dir2 current/include/
+          previous/build/lib/libfuse3.so
+          current/build/lib/libfuse3.so

.github/workflows/abicheck.yml

@@ -0,0 +1,76 @@
+---
+name: 'libfuse ABI check against previous major release'
+
+on:
+  push:
+    branches:
+      - master
+      - 'fuse-[0-9]+.[0-9]+*'  # This will match branches like 3.17, 3.18, 4.0, etc.
+  pull_request:
+    branches:
+      - master
+      - 'fuse-[0-9]+.[0-9]+*'
+permissions:
+  contents: read
+
+jobs:
+  abi:
+    runs-on: '${{ matrix.os }}'
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+
+    steps:
+      - name: Install dependencies (Ubuntu)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install abigail-tools clang gcc liburing-dev libnuma-dev
+
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        with:
+          path: current
+          fetch-depth: 0  # Fetch all history and tags
+
+      - name: Determine previous major release tag
+        id: prev_release
+        run: |
+          cd current
+          chmod +x .github/workflows/find_previous_release_tag.sh
+          PREV_TAG=$(.github/workflows/find_previous_release_tag.sh)
+          echo "prev_tag=$PREV_TAG" >> $GITHUB_OUTPUT
+
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        with:
+          path: previous
+          ref: ${{ steps.prev_release.outputs.prev_tag }}
+
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        with:
+          python-version: '3.12'
+
+      - name: Build current
+        working-directory: current
+        run: |
+          pip install -r requirements.txt
+          meson setup build --buildtype=debug
+          meson compile -C build
+
+      - name: Build previous
+        working-directory: previous
+        run: |
+          echo "Previous release tag: ${{ steps.prev_release.outputs.prev_tag }}"
+          echo "Commit-id of previous release: $(git show HEAD)"
+          pip install -r requirements.txt
+          meson setup build --buildtype=debug
+          meson compile -C build
+
+      - name: Run abidiff
+        run: abidiff
+          --no-added-syms
+          --suppressions current/.github/workflows/abidiff_suppressions.abignore
+          --headers-dir1 previous/include/
+          --headers-dir2 current/include/
+          previous/build/lib/libfuse3.so
+          current/build/lib/libfuse3.so

.github/workflows/abicheck_prev_release.yml

@@ -0,0 +1,36 @@
+# Suppression file for abidiff false positives in libfuse
+# This file suppresses ABI changes that are actually compatible but flagged by abidiff
+
+[suppress_type]
+# Suppress the fuse_conn_info reserved array transformation
+# This change is ABI-compatible: uint32_t[16] -> uint16_t request_timeout + uint16_t[31]
+# Both use exactly 64 bytes (16*4 = 32*2 = 64 bytes)
+name = fuse_conn_info
+# Suppress changes to the reserved field that are size/offset related
+change_kind = size-or-offset-change
+has_data_member_inserted_at = offset_in_bits(512)
+
+[suppress_type]
+# Also suppress the general struct size change for fuse_conn_info
+# since the total size remains the same (128 bytes) by a static assertion
+# in the code
+name = fuse_conn_info
+change_kind = size-change
+
+[suppress_type]
+# Suppress ALL changes to fuse_operations struct
+# These are backward compatible due to the op_size mechanism in fuse_main()
+# Applications pass sizeof(struct fuse_operations) at compile time,
+# and the library uses memcpy(&fs->op, op, op_size) to safely copy only
+# the fields the application knows about. New fields remain NULL.
+name = fuse_operations
+has_data_member_inserted_at = end
+has_size_change = yes
+
+[suppress_type]
+# Suppress ALL changes to fuse_lowlevel_ops struct
+# These are backward compatible due to the op_size mechanism in fuse_session_new()
+# Same pattern as fuse_operations - op_size controls safe copying
+name = fuse_lowlevel_ops
+has_data_member_inserted_at = end
+has_size_change = yes

.github/workflows/abidiff_suppressions.abignore

@@ -0,0 +1,33 @@
+---
+# TODO: integrate into matrix.os in pr-ci.yml
+# TODO: add NetBSD and DragonFlyBSD
+name: 'Build (FreeBSD)'
+on:
+  push:
+    branches:
+      - master
+      - 'fuse-[0-9]+.[0-9]+*'
+  pull_request:
+    branches:
+      - master
+      - 'fuse-[0-9]+.[0-9]+*'
+
+jobs:
+  build_bsd:
+    runs-on: ubuntu-latest
+    name: Build under FreeBSD
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v6.0.1
+    - name: Build
+      uses: vmactions/freebsd-vm@v1
+      with:
+        usesh: true
+        prepare: |
+          pkg install -y meson ninja
+        run: |
+          mkdir build
+          cd build
+          meson setup ..
+          ninja -v
+...

.github/workflows/bsd.yaml

@@ -1,20 +1,16 @@
 name: Checkpatch
 
 on:
-  push:
-    branches:
-      - master
   pull_request:
+    types: [opened, synchronize, reopened]
     branches:
       - master
-permissions:
-  contents: read
 
 jobs:
   checkpatch:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       with:
         fetch-depth: 0
     - name: Install dependencies
@@ -23,14 +19,23 @@ jobs:
         sudo apt-get install -y perl
     - name: Run checkpatch.pl
       run: |
+        if [ -z "${{ github.base_ref }}" ]; then
+          echo "Not a pull request, skipping checkpatch"
+          exit 0
+        fi
         git fetch origin ${{ github.base_ref }}
         base_commit=$(git merge-base origin/${{ github.base_ref }} HEAD)
         echo "Base commit: $base_commit"
         echo "Running checkpatch.pl on all commits in the PR:"
         git rev-list --reverse $base_commit..HEAD | while read commit; do
+          # Skip dependabot commits - we do not have control over it
+          if git log -1 --format='%ae' $commit | grep -q "dependabot"; then
+            echo "Skipping dependabot commit: $commit"
+            continue
+          fi
           subject=$(git log -1 --format=%s $commit)
           echo "Checking commit: $commit - $subject"
-          if ! ./checkpatch.pl --no-tree --ignore MAINTAINERS,SPDX_LICENSE_TAG,COMMIT_MESSAGE,FILE_PATH_CHANGES,EMAIL_SUBJECT,AVOID_EXTERNS,GIT_COMMIT_ID,ENOSYS_SYSCALL -g $commit; then
+          if ! ./checkpatch.pl --max-line-length=100 --no-tree --ignore MAINTAINERS,SPDX_LICENSE_TAG,COMMIT_MESSAGE,FILE_PATH_CHANGES,EMAIL_SUBJECT,AVOID_EXTERNS,GIT_COMMIT_ID,ENOSYS_SYSCALL,ENOSYS,FROM_SIGN_OFF_MISMATCH,QUOTED_COMMIT_ID,PREFER_ATTRIBUTE_ALWAYS_UNUSED,PREFER_DEFINED_ATTRIBUTE_MACRO  -g $commit; then
             echo "checkpatch.pl found issues in commit $commit - $subject"
             exit 1
           fi