linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Brauner <brauner@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Christian Brauner <brauner@kernel.org>,
	linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [GIT PULL] vfs fixes
Date: Mon,  6 Jan 2025 16:32:26 +0100	[thread overview]
Message-ID: <20250106-vfs-fixes-5a197ffbc262@brauner> (raw)

Hey Linus,

slowly resurrecting from the holidays... What year is it? And have we
already started generating pull requests with AI?

/* Summary */

This contains various fixes for this cycle:

- Relax assertions on failure to encode file handles.
  The ->encode_fh() method can fail for various reasons. None of them
  warrant a WARN_ON().

- Fix overlayfs file handle encoding by allowing encoding an fid from an
  inode without an alias.

- Make sure fuse_dir_open() handles FOPEN_KEEP_CACHE. If it's not
  specified fuse needs to invaludate the directory inode page cache.

- Fix qnx6 so it builds with gcc-15.

- Various fixes for netfslib and ceph and nfs filesystems:

  - Ignore silly rename files from afs and nfs when building header archives.

  - Fix read result collection in netfslib with multiple subrequests.

  - Handle ENOMEM for netfslib buffered reads.

  - Fix oops in nfs_netfs_init_request().

  - Parse the secctx command immediately in cachefiles.

  - Remove a redundant smp_rmb() in netfslib.

  - Handle recursion in read retry in netfslib.

  - Fix clearing of folio_queue.

  - Fix missing cancellation of copy-to_cache when the cache for a file
    is temporarly disabled in netfslib.

- Sanity check the hfs root record.

- Fix zero padding data issues in concurrent write scenarios.

- Fix is_mnt_ns_file() after converting nsfs to path_from_stashed().

- Fix missing declaration of init_files.

- Increase I/O priority when writing revoke records in jbd2.

- Flush filesystem device before updating tail sequence in jbd2.

/* Testing */

gcc version 14.2.0 (Debian 14.2.0-6)
Debian clang version 16.0.6 (27+b1)

No build failures or warnings were observed.

/* Conflicts */

Merge conflicts with mainline
=============================

- There will be a small merge conflict with mainline. The conflict
  resolution should like this:

diff --cc fs/smb/client/smb2pdu.c
index 959359301250,458b53d1f9cb..000000000000
--- a/fs/smb/client/smb2pdu.c
+++ b/fs/smb/client/smb2pdu.c
@@@ -4840,12 -4841,12 +4841,14 @@@ smb2_writev_callback(struct mid_q_entr
                if (written > wdata->subreq.len)
                        written &= 0xFFFF;

 +              cifs_stats_bytes_written(tcon, written);
 +
-               if (written < wdata->subreq.len)
+               if (written < wdata->subreq.len) {
                        wdata->result = -ENOSPC;
-               else
+               } else if (written > 0) {
                        wdata->subreq.len = written;
+                       __set_bit(NETFS_SREQ_MADE_PROGRESS, &wdata->subreq.flags);
+               }
                break;
        case MID_REQUEST_SUBMITTED:
        case MID_RETRY_NEEDED:

Merge conflicts with other trees
================================

No known conflicts.

The following changes since commit 40384c840ea1944d7c5a392e8975ed088ecf0b37:

  Linux 6.13-rc1 (2024-12-01 14:28:56 -0800)

are available in the Git repository at:

  git@gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs tags/vfs-6.13-rc7.fixes

for you to fetch changes up to 368fcc5d3f8bf645a630a44e65f5eb008aba7082:

  Merge patch series "Fix encoding overlayfs fid for fanotify delete events" (2025-01-06 15:43:58 +0100)

Please consider pulling these changes from the signed vfs-6.13-rc7.fixes tag.

Thanks!
Christian

----------------------------------------------------------------
vfs-6.13-rc7.fixes

----------------------------------------------------------------
Amir Goldstein (4):
      fs: relax assertions on failure to encode file handles
      fuse: respect FOPEN_KEEP_CACHE on opendir
      ovl: pass realinode to ovl_encode_real_fh() instead of realdentry
      ovl: support encoding fid from inode with no alias

Brahmajit Das (1):
      fs/qnx6: Fix building with GCC 15

Christian Brauner (4):
      Merge patch series "jbd2: two straightforward fixes"
      Merge patch series "iomap: fix zero padding data issue in concurrent append writes"
      Merge patch series "netfs, ceph, nfs, cachefiles: Miscellaneous fixes/changes"
      Merge patch series "Fix encoding overlayfs fid for fanotify delete events"

David Howells (9):
      kheaders: Ignore silly-rename files
      netfs: Fix non-contiguous donation between completed reads
      netfs: Fix enomem handling in buffered reads
      nfs: Fix oops in nfs_netfs_init_request() when copying to cache
      netfs: Fix missing barriers by using clear_and_wake_up_bit()
      netfs: Work around recursion by abandoning retry if nothing read
      netfs: Fix ceph copy to cache on write-begin
      netfs: Fix the (non-)cancellation of copy when cache is temporarily disabled
      netfs: Fix is-caching check in read-retry

Leo Stone (1):
      hfs: Sanity check the root record

Long Li (2):
      iomap: pass byte granular end position to iomap_add_to_ioend
      iomap: fix zero padding data issue in concurrent append writes

Max Kellermann (1):
      cachefiles: Parse the "secctx" immediately

Miklos Szeredi (1):
      fs: fix is_mnt_ns_file()

Zhang Kunbo (1):
      fs: fix missing declaration of init_files

Zhang Yi (2):
      jbd2: increase IO priority for writing revoke records
      jbd2: flush filesystem device before updating tail sequence

Zilin Guan (1):
      netfs: Remove redundant use of smp_rmb()

 fs/9p/vfs_addr.c         |  6 ++++-
 fs/afs/write.c           |  5 +++-
 fs/cachefiles/daemon.c   | 14 +++++-----
 fs/cachefiles/internal.h |  3 ++-
 fs/cachefiles/security.c |  6 ++---
 fs/file.c                |  1 +
 fs/fuse/dir.c            |  2 ++
 fs/hfs/super.c           |  4 ++-
 fs/iomap/buffered-io.c   | 66 +++++++++++++++++++++++++++++++++++++++++-------
 fs/jbd2/commit.c         |  4 +--
 fs/jbd2/revoke.c         |  2 +-
 fs/namespace.c           | 10 ++++++--
 fs/netfs/buffered_read.c | 28 +++++++++++---------
 fs/netfs/direct_write.c  |  1 -
 fs/netfs/read_collect.c  | 33 ++++++++++++++----------
 fs/netfs/read_pgpriv2.c  |  4 +++
 fs/netfs/read_retry.c    |  8 +++---
 fs/netfs/write_collect.c | 14 ++++------
 fs/netfs/write_issue.c   |  2 ++
 fs/nfs/fscache.c         |  9 ++++++-
 fs/notify/fdinfo.c       |  4 +--
 fs/overlayfs/copy_up.c   | 16 ++++++------
 fs/overlayfs/export.c    | 49 +++++++++++++++++++----------------
 fs/overlayfs/namei.c     |  4 +--
 fs/overlayfs/overlayfs.h |  2 +-
 fs/qnx6/inode.c          | 11 +++-----
 fs/smb/client/cifssmb.c  | 13 +++++++---
 fs/smb/client/smb2pdu.c  |  9 ++++---
 include/linux/iomap.h    |  2 +-
 include/linux/netfs.h    |  7 +++--
 kernel/gen_kheaders.sh   |  1 +
 31 files changed, 217 insertions(+), 123 deletions(-)

             reply	other threads:[~2025-01-06 15:36 UTC|newest]

Thread overview: 188+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-06 15:32 Christian Brauner [this message]
2025-01-06 18:40 ` [GIT PULL] vfs fixes pr-tracker-bot
  -- strict thread matches above, loose matches on Subject: below --
2025-08-19 12:46 Christian Brauner
2025-08-19 17:33 ` pr-tracker-bot
2025-07-25  8:54 Christian Brauner
2025-07-25 15:39 ` pr-tracker-bot
2025-07-19 10:59 Christian Brauner
2025-07-19 18:29 ` pr-tracker-bot
2025-07-04  8:36 Christian Brauner
2025-07-04 17:36 ` pr-tracker-bot
2025-06-16  8:20 Christian Brauner
2025-06-16 16:12 ` pr-tracker-bot
2025-06-02  9:02 Christian Brauner
2025-06-02 22:58 ` pr-tracker-bot
2025-05-23 10:26 Christian Brauner
2025-05-23 14:56 ` pr-tracker-bot
2025-05-12 11:01 Christian Brauner
2025-05-13  3:33 ` pr-tracker-bot
2025-04-25 21:22 Christian Brauner
2025-04-25 23:35 ` pr-tracker-bot
2025-04-19 21:04 Christian Brauner
2025-04-19 21:38 ` pr-tracker-bot
2025-04-14 10:44 Christian Brauner
2025-04-14 17:41 ` pr-tracker-bot
2025-04-02 15:46 Christian Brauner
2025-04-03  0:11 ` pr-tracker-bot
2025-03-20 15:22 Christian Brauner
2025-03-20 21:21 ` pr-tracker-bot
2025-03-13  9:13 Christian Brauner
2025-03-13 19:04 ` pr-tracker-bot
2025-03-06 10:13 Christian Brauner
2025-03-06 18:20 ` pr-tracker-bot
2025-02-25 11:51 Christian Brauner
2025-02-25 17:52 ` pr-tracker-bot
2025-02-17 10:37 Christian Brauner
2025-02-17 18:44 ` pr-tracker-bot
2025-02-07 10:52 Christian Brauner
2025-02-07 22:25 ` pr-tracker-bot
2025-01-10 15:16 Christian Brauner
2025-01-10 18:12 ` pr-tracker-bot
2024-11-27 15:41 Christian Brauner
2024-11-27 16:14 ` Linus Torvalds
2024-11-27 16:15 ` pr-tracker-bot
2024-11-01 12:43 Christian Brauner
2024-11-01 17:48 ` pr-tracker-bot
2024-10-21 11:46 Christian Brauner
2024-10-21 18:27 ` pr-tracker-bot
2024-10-03  9:00 Christian Brauner
2024-10-03 16:53 ` pr-tracker-bot
2024-09-30 13:46 Christian Brauner
2024-09-30 20:21 ` pr-tracker-bot
2024-09-04 12:03 Christian Brauner
2024-09-04 16:46 ` pr-tracker-bot
2024-08-26 15:25 Christian Brauner
2024-08-27  5:04 ` pr-tracker-bot
2024-08-14 13:29 Christian Brauner
2024-08-14 16:28 ` pr-tracker-bot
2024-07-27  9:05 Christian Brauner
2024-07-27 22:37 ` pr-tracker-bot
2024-07-24  9:19 Christian Brauner
2024-07-24 17:19 ` pr-tracker-bot
2024-07-18  9:01 Christian Brauner
2024-07-19  1:04 ` pr-tracker-bot
2024-07-11  5:09 Christian Brauner
2024-07-11 19:24 ` pr-tracker-bot
2024-07-02 19:44 Christian Brauner
2024-07-02 20:56 ` pr-tracker-bot
2024-07-01 11:53 Christian Brauner
2024-07-01 16:49 ` pr-tracker-bot
2024-06-10 14:09 Christian Brauner
2024-06-11 19:15 ` Linus Torvalds
2024-06-12 11:30   ` Christian Brauner
2024-06-11 23:42 ` pr-tracker-bot
2024-05-27 11:55 Christian Brauner
2024-05-27 15:30 ` pr-tracker-bot
2024-04-26 14:59 Christian Brauner
2024-04-26 18:09 ` pr-tracker-bot
2024-04-05 11:22 Christian Brauner
2024-04-05 17:09 ` pr-tracker-bot
2024-03-18 12:19 Christian Brauner
2024-03-18 16:48 ` pr-tracker-bot
2024-03-18 19:14 ` Linus Torvalds
2024-03-18 19:41   ` Linus Torvalds
2024-03-19  6:58     ` Christian Brauner
2024-03-20 10:21       ` Christian Brauner
2024-03-06 15:45 Christian Brauner
2024-03-06 16:33 ` pr-tracker-bot
2024-03-01 12:45 Christian Brauner
2024-03-01 20:37 ` pr-tracker-bot
2024-02-22 14:03 Christian Brauner
2024-02-22 18:18 ` pr-tracker-bot
2024-02-12 13:00 Christian Brauner
2024-02-12 17:03 ` pr-tracker-bot
2024-01-13 12:31 Christian Brauner
2024-01-17 20:03 ` pr-tracker-bot
2023-11-24 10:27 Christian Brauner
2023-11-24 18:25 ` Linus Torvalds
2023-11-24 18:52   ` Linus Torvalds
2023-11-24 20:12     ` Linus Torvalds
2023-11-25 13:05       ` Christian Brauner
2023-11-25 13:10   ` Christian Brauner
2023-11-25 13:28     ` Omar Sandoval
2023-11-25 14:04       ` Christian Brauner
2023-11-24 18:26 ` pr-tracker-bot
2023-10-19 10:07 Christian Brauner
2023-10-19 16:37 ` Linus Torvalds
2023-10-20 11:14   ` Christian Brauner
2023-10-19 18:36 ` pr-tracker-bot
2023-09-26 10:39 Christian Brauner
2023-09-26 16:14 ` pr-tracker-bot
2023-07-06 11:52 Christian Brauner
2023-07-07  2:27 ` pr-tracker-bot
2023-07-02 11:28 Christian Brauner
2023-07-02 18:53 ` pr-tracker-bot
2023-05-25 12:22 Christian Brauner
2023-05-25 18:18 ` pr-tracker-bot
2023-05-12 15:31 Christian Brauner
2023-05-12 22:14 ` pr-tracker-bot
2023-04-03 11:04 Christian Brauner
2023-04-03 16:51 ` pr-tracker-bot
2023-03-12 12:18 Christian Brauner
2023-03-12 16:20 ` pr-tracker-bot
2020-09-22 21:29 [git pull] " Al Viro
2020-09-22 22:15 ` pr-tracker-bot
     [not found] <CAHk-=wgdsv1UA+QtgiJM8KQAG7N7_9iK_edchnzZYyj+nxmfLA@mail.gmail.com>
     [not found] ` <20200113195448.GT8904@ZenIV.linux.org.uk>
     [not found]   ` <CAHk-=whn5qk-e-KnYr6HNe5hp45v+XyDbsA2+szXvK3gC06A2w@mail.gmail.com>
2020-01-15  6:41     ` Al Viro
2020-01-15 19:35       ` pr-tracker-bot
2018-07-01 12:31 Al Viro
2018-07-01 19:36 ` Linus Torvalds
2018-07-01 20:05   ` Al Viro
2018-07-01 20:25     ` Linus Torvalds
2018-04-20 15:58 Al Viro
2018-04-20 18:29 ` Andrew Morton
2018-04-20 19:09   ` Al Viro
2018-04-20 19:57     ` Andrew Morton
2017-06-17  2:56 Al Viro
2017-04-09  5:40 Al Viro
2017-04-11  6:10 ` Linus Torvalds
2017-04-11  6:48   ` Al Viro
2017-04-11 21:02     ` Andreas Dilger
2017-04-12  7:00       ` Linus Torvalds
2017-04-15  6:41 ` Vegard Nossum
2017-04-15 16:51   ` Linus Torvalds
2017-04-15 17:08     ` Al Viro
2017-04-02 17:01 Al Viro
2017-04-02 23:59 ` Linus Torvalds
2017-04-03  0:10   ` Linus Torvalds
2017-04-03  0:30     ` Al Viro
2017-04-03  0:43       ` Al Viro
2017-04-03  0:58         ` Linus Torvalds
2017-04-03  2:21           ` Al Viro
2017-04-03  6:00             ` Eric W. Biederman
2017-04-03  7:46               ` Al Viro
2017-04-04  0:22               ` Ian Kent
2017-04-04  0:47               ` Ian Kent
2017-04-03  0:20   ` Al Viro
2016-06-17 20:50 Q. hlist_bl_add_head_rcu() in d_alloc_parallel() J. R. Okajima
2016-06-17 22:16 ` Al Viro
2016-06-19  5:24   ` J. R. Okajima
2016-06-19 16:55     ` Al Viro
2016-06-20  4:34       ` J. R. Okajima
2016-06-20  5:35         ` Al Viro
2016-06-20 14:51           ` Al Viro
2016-06-20 17:14             ` [git pull] vfs fixes Al Viro
2016-06-08  2:12 Al Viro
2016-05-28  0:10 Al Viro
2016-02-28  1:09 Al Viro
2014-09-14 19:47 Al Viro
2014-09-26 20:38 ` Joachim Eastwood
2014-09-26 20:46 ` Joachim Eastwood
2014-09-26 20:58   ` Al Viro
2014-09-26 21:28     ` Joachim Eastwood
2014-09-26 21:52       ` Joachim Eastwood
2014-03-24 22:58 Imre Deak
2014-03-25  7:21 ` Sedat Dilek
2014-03-23  7:16 Al Viro
2014-03-23 10:57 ` Sedat Dilek
2014-03-23 15:35   ` Al Viro
2014-03-23 16:56     ` Al Viro
2014-03-23 16:36 ` Linus Torvalds
2014-03-23 16:45   ` Al Viro
2014-03-23 17:01     ` Linus Torvalds
2014-03-24  8:52       ` Sedat Dilek
2014-03-25  0:46         ` Linus Torvalds
2014-03-26 16:36           ` Sedat Dilek
2014-03-26 20:55             ` Linus Torvalds
2014-03-27  6:14               ` Sedat Dilek
2014-03-30 20:33               ` Al Viro
2014-03-30 20:55                 ` Al Viro
2014-03-30 22:39                   ` Linus Torvalds
2014-03-30 23:21                     ` Al Viro
2013-06-22  7:16 Al Viro
2013-03-27  0:36 Al Viro
2012-03-10 21:30 Al Viro
2012-03-10 21:49 ` Linus Torvalds
2012-03-10 22:14   ` Al Viro

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250106-vfs-fixes-5a197ffbc262@brauner \
    --to=brauner@kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).