[PATCH] splice: remove duplicate noinline from pipe_clear_nowait

[PATCH] splice: remove duplicate noinline from pipe_clear_nowait

[T.J. Mercier]

pipe_clear_nowait has two noinline macros, but we only need one.

I checked the whole tree, and this is the only occurrence:

$ grep -r "noinline .* noinline"
fs/splice.c:static noinline void noinline pipe_clear_nowait(struct file *file)
$

Fixes: 0f99fc513ddd ("splice: clear FMODE_NOWAIT on file if splice/vmsplice is used")
Signed-off-by: T.J. Mercier <tjmercier@google.com>
---
 fs/splice.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/splice.c b/fs/splice.c
index 90d464241f15..4d6df083e0c0 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -45,7 +45,7 @@
  * here if set to avoid blocking other users of this pipe if splice is
  * being done on it.
  */
-static noinline void noinline pipe_clear_nowait(struct file *file)
+static noinline void pipe_clear_nowait(struct file *file)
 {
 	fmode_t fmode = READ_ONCE(file->f_mode);
 

base-commit: 9d7a0577c9db35c4cc52db90bc415ea248446472
-- 
2.49.0.805.g082f7c87e0-goog

Re: [PATCH] splice: remove duplicate noinline from pipe_clear_nowait

[Jens Axboe]

On 4/23/25 12:00 PM, T.J. Mercier wrote:
> pipe_clear_nowait has two noinline macros, but we only need one.
> 
> I checked the whole tree, and this is the only occurrence:
> 
> $ grep -r "noinline .* noinline"
> fs/splice.c:static noinline void noinline pipe_clear_nowait(struct file *file)
> $

Funky! Obivously looks fine:

Reviewed-by: Jens Axboe <axboe@kernel.dk>

-- 
Jens Axboe

Re: [PATCH] splice: remove duplicate noinline from pipe_clear_nowait

[Christian Brauner]

On Wed, 23 Apr 2025 18:00:23 +0000, T.J. Mercier wrote:
> pipe_clear_nowait has two noinline macros, but we only need one.
> 
> I checked the whole tree, and this is the only occurrence:
> 
> $ grep -r "noinline .* noinline"
> fs/splice.c:static noinline void noinline pipe_clear_nowait(struct file *file)
> $
> 
> [...]

Applied to the vfs.fixes branch of the vfs/vfs.git tree.
Patches in the vfs.fixes branch should appear in linux-next soon.

Please report any outstanding bugs that were missed during review in a
new review to the original patch series allowing us to drop it.

It's encouraged to provide Acked-bys and Reviewed-bys even though the
patch has now been applied. If possible patch trailers will be updated.

Note that commit hashes shown below are subject to change due to rebase,
trailer updates or similar. If in doubt, please check the listed branch.

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
branch: vfs.fixes

[1/1] splice: remove duplicate noinline from pipe_clear_nowait
      https://git.kernel.org/vfs/vfs/c/894399bf728a