2021-08-31 10:09:12

by Christian Brauner

[permalink] [raw]
Subject: [GIT PULL] close_range updates

Hi Linus,

/* Summary */
This is a cleanup for close_range() which was sent as part of a bugfix we did
some time ago in 9b5b872215fe ("file: fix close_range() for unshare+cloexec").
We used to share more code between some helpers for close_range() which made
retrieving the maximum number of open fds before calling into the helpers
sensible. But with the introduction of CLOSE_RANGE_CLOEXEC and the need to
retrieve the number of maximum fds once more for CLOSE_RANGE_CLOEXEC that
stopped making sense. So the code was in a dumb in-limbo state. Fix this by
simplifying the code a bit.

The bugfix itself in 9b5b872215fe ("file: fix close_range() for
unshare+cloexec") was either applied directly by you or I sent it as a separate
PR. In any case, the idea was to only fix the bug itself and make backporting
easy. And since the cleanup wasn't very pressing I left it in linux-next for a
very long time. Note, I didn't pull the patches from the list again back then
which is why they don't have lore-links. I'm listing them here explicitly
though:
03ba0fe4d09f ("file: simplify logic in __close_range()")
Link: https://lore.kernel.org/linux-fsdevel/[email protected]

f49fd6d3c070 ("file: let pick_file() tell caller it's done")
Link: https://lore.kernel.org/linux-fsdevel/[email protected]

/* Testing */
All patches have been in linux-next since 5.12-rc4. No build failures or
warnings were observed. All old and new tests are passing.

(In case any question come up I'll be on vacation next week so responding might
take a while.)

/* Conflicts */
At the time of creating this PR no merge conflicts were reported from
linux-next and no merge conflicts showed up doing a test-merge with current
mainline.

The following changes since commit 9b5b872215fe6d1ca6a1ef411f130bd58e269012:

file: fix close_range() for unshare+cloexec (2021-04-02 14:11:10 +0200)

are available in the Git repository at:

[email protected]:pub/scm/linux/kernel/git/brauner/linux tags/fs.close_range.v5.15

for you to fetch changes up to 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d:

file: simplify logic in __close_range() (2021-04-02 14:11:10 +0200)

Please consider pulling these changes from the signed fs.close_range.v5.15 tag.

Thanks!
Christian

----------------------------------------------------------------
fs.close_range.v5.15

----------------------------------------------------------------
Christian Brauner (2):
file: let pick_file() tell caller it's done
file: simplify logic in __close_range()

fs/file.c | 64 +++++++++++++++++++++++++++++++++++++++------------------------
1 file changed, 40 insertions(+), 24 deletions(-)


2021-08-31 21:50:18

by pr-tracker-bot

[permalink] [raw]
Subject: Re: [GIT PULL] close_range updates

The pull request you sent on Tue, 31 Aug 2021 12:02:39 +0200:

> [email protected]:pub/scm/linux/kernel/git/brauner/linux tags/fs.close_range.v5.15

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/927bc120a248b658acc2f5206ec4e81a794d8a57

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html