]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
splice: remove duplicate noinline from pipe_clear_nowait
authorT.J. Mercier <tjmercier@google.com>
Wed, 23 Apr 2025 18:00:23 +0000 (18:00 +0000)
committerChristian Brauner <brauner@kernel.org>
Fri, 25 Apr 2025 10:11:56 +0000 (12:11 +0200)
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>
Link: https://lore.kernel.org/20250423180025.2627670-1-tjmercier@google.com
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Christian Brauner <brauner@kernel.org>
fs/splice.c

index 90d464241f151ce22c304526a71ada45015c3d13..4d6df083e0c06a774fd421806a3e40de6d32447f 100644 (file)
@@ -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);