| Message ID | 20241115-vfs-netfs-7df3b2479ea4@brauner (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL] vfs netfs | expand |
On Fri, 15 Nov 2024 at 06:00, Christian Brauner <brauner@kernel.org> wrote: > > A pidfs patch ended up in the branch and I didn't notice it. I decided > to leave it in here instead of rebasing the whole branch. What happened here? Not only isn't there a pidfs patch in here, it also doesn't have the afs patches you claim it has, because all of those came in long ago in commit a5f24c795513: "Pull vfs fixes from Christian Brauner". So I've pulled this, but your pull request was all wonky because you used some odd base commit. Linus
The pull request you sent on Fri, 15 Nov 2024 15:00:21 +0100:
> git@gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs tags/vfs-6.13.netfs
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/8dcf44fcad5ef5c1ff915628255c19cbe91f2588
Thank you!
On Mon, Nov 18, 2024 at 10:29:42AM -0800, Linus Torvalds wrote: > On Fri, 15 Nov 2024 at 06:00, Christian Brauner <brauner@kernel.org> wrote: > > > > A pidfs patch ended up in the branch and I didn't notice it. I decided > > to leave it in here instead of rebasing the whole branch. > > What happened here? The base of the branch is definitely v6.12-rc1. The branch is simply vfs.netfs with vfs-6.13.netfs tag. And the branch looks perfectly fine. I think the issue was that I sent you the fixes tag you mention below that contained some fixes that were in vfs.netfs. So afterwards I just didn't rebase vfs.netfs but merged two other series on top of it with v6.12-rc1 as parent. And I think that might've somehow confused the git request-pull call. Rebasing would've been the cleaner thing here since I had a long time until the merge window. But other than that it doesn't look like I did something that was actively wrong? But I might just be missing something. > > Not only isn't there a pidfs patch in here, it also doesn't have the > afs patches you claim it has, because all of those came in long ago in > commit a5f24c795513: "Pull vfs fixes from Christian Brauner". > > So I've pulled this, but your pull request was all wonky because you > used some odd base commit. > > Linus
On Wed, 20 Nov 2024 at 00:49, Christian Brauner <brauner@kernel.org> wrote: > > The base of the branch is definitely v6.12-rc1. The branch is simply > vfs.netfs with vfs-6.13.netfs tag. And the branch looks perfectly fine. The branch looks fine, it was just the pull request that contained old stale commits that you had already sent me. > I think the issue was that I sent you the fixes tag you mention below > that contained some fixes that were in vfs.netfs. So afterwards I just > didn't rebase vfs.netfs but merged two other series on top of it with > v6.12-rc1 as parent. And I think that might've somehow confused the git > request-pull call. Oh, you shouldn't rebase. But it also sounds like you are actually tracking the bases for your branches manually. You shouldn't do that either. All you need to do is fetch from upstream, so that git sees what I have, and then when you do the pull request, you tell it not the base of the branch, but just what upstream has. git will then figure out the base from that. Linus
On Wed, Nov 20, 2024 at 09:09:44AM -0800, Linus Torvalds wrote: > On Wed, 20 Nov 2024 at 00:49, Christian Brauner <brauner@kernel.org> wrote: > > > > The base of the branch is definitely v6.12-rc1. The branch is simply > > vfs.netfs with vfs-6.13.netfs tag. And the branch looks perfectly fine. > > The branch looks fine, it was just the pull request that contained old > stale commits that you had already sent me. > > > I think the issue was that I sent you the fixes tag you mention below > > that contained some fixes that were in vfs.netfs. So afterwards I just > > didn't rebase vfs.netfs but merged two other series on top of it with > > v6.12-rc1 as parent. And I think that might've somehow confused the git > > request-pull call. > > Oh, you shouldn't rebase. But it also sounds like you are actually I don't as I'm well aware how much you dislike that. Here I had a bunch of fixes and I usually carry them on a separate branch and have another feature branch for new stuff. But in this case I ended up using the branch for some hot fixes instead of carrying them on the separate vfs.fixes branch. But when I pulled in the features I should have reset/rebased the branch. > tracking the bases for your branches manually. You shouldn't do that > either. > > All you need to do is fetch from upstream, so that git sees what I > have, and then when you do the pull request, you tell it not the base > of the branch, but just what upstream has. git will then figure out > the base from that. Yeah, that's what I do. I do a git fetch upstream and then just point git request-pull to that and then things work fine. Anyway, thanks for pointing it out and sorry for the confusion.
Hey Linus, A pidfs patch ended up in the branch and I didn't notice it. I decided to leave it in here instead of rebasing the whole branch. /* Summary */ This contains various fixes for the netfs library and related filesystems and infrastructure: afs: - Fix missing wire-up of afs_retry_request(). - Fix the setting of the server responding flag in afs. - Fix possible infinite loop with unresponsive servers. - Remove unused struct and function prototype. cachefiles: - Fix a dentry leak in cachefiles_open_file(). - Fix incorrect length return value in cachefiles_ondemand_fd_write_iter(). - Fix missing pos updates in cachefiles_ondemand_fd_write_iter(). - Clean up in cachefiles_commit_tmpfile(). - Fix NULL pointer dereference in object->file. - Add a memory barrier for FSCACHE_VOLUME_CREATING. netfs: - Advance iterator correctly rather than jumping it. - Add folio_queue API documentation. - Fix the netfs_folio tracepoint to handle NULL mapping. - Remove call to folio_index(). - Fix a few minor bugs in netfs_page_mkwrite(). - Remove unnecessary references to pages. pidfs: - Check for valid pid namespace. /* Testing */ gcc version 14.2.0 (Debian 14.2.0-6) Debian clang version 16.0.6 (27+b1) All patches are based on v6.12-rc1 and have been sitting in linux-next. No build failures or warnings were observed. /* Conflicts */ Merge conflicts with mainline ============================= No known conflicts. Merge conflicts with other trees ================================ No known conflicts. The following changes since commit 9852d85ec9d492ebef56dc5f229416c925758edc: Linux 6.12-rc1 (2024-09-29 15:06:19 -0700) are available in the Git repository at: git@gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs tags/vfs-6.13.netfs for you to fetch changes up to a4b2923376be062a243ac38762212a38485cfab1: Merge patch series "fscache/cachefiles: Some bugfixes" (2024-11-11 14:39:39 +0100) Please consider pulling these changes from the signed vfs-6.13.netfs tag. Thanks! Christian ---------------------------------------------------------------- vfs-6.13.netfs ---------------------------------------------------------------- Baokun Li (1): cachefiles: fix dentry leak in cachefiles_open_file() Christian Brauner (3): pidfs: check for valid pid namespace Merge patch series "Random netfs folio fixes" Merge patch series "fscache/cachefiles: Some bugfixes" David Howells (5): afs: Fix missing wire-up of afs_retry_request() afs: Fix the setting of the server responding flag netfs: Advance iterator correctly rather than jumping it netfs: Add folio_queue API documentation netfs: Fix the netfs_folio tracepoint to handle NULL mapping Marc Dionne (1): afs: Fix possible infinite loop with unresponsive servers Matthew Wilcox (Oracle) (3): netfs: Remove call to folio_index() netfs: Fix a few minor bugs in netfs_page_mkwrite() netfs: Remove unnecessary references to pages Thorsten Blum (1): afs: Remove unused struct and function prototype Zizhi Wo (5): cachefiles: Fix incorrect length return value in cachefiles_ondemand_fd_write_iter() cachefiles: Fix missing pos updates in cachefiles_ondemand_fd_write_iter() cachefiles: Clean up in cachefiles_commit_tmpfile() cachefiles: Fix NULL pointer dereference in object->file netfs/fscache: Add a memory barrier for FSCACHE_VOLUME_CREATING Documentation/core-api/folio_queue.rst | 212 +++++++++++++++++++++++++++++++++ fs/afs/afs_vl.h | 9 -- fs/afs/file.c | 1 + fs/afs/fs_operation.c | 2 +- fs/afs/fs_probe.c | 4 +- fs/afs/rotate.c | 11 +- fs/cachefiles/interface.c | 14 ++- fs/cachefiles/namei.c | 12 +- fs/cachefiles/ondemand.c | 38 ++++-- fs/netfs/buffered_read.c | 8 +- fs/netfs/buffered_write.c | 41 ++++--- fs/netfs/fscache_volume.c | 3 +- fs/netfs/write_issue.c | 12 +- fs/pidfs.c | 5 +- include/linux/folio_queue.h | 168 ++++++++++++++++++++++++++ include/trace/events/netfs.h | 5 +- 16 files changed, 475 insertions(+), 70 deletions(-) create mode 100644 Documentation/core-api/folio_queue.rst