* + fs-io_uringc-fix-build.patch added to -mm tree
@ 2021-04-11 22:54 akpm
2021-04-11 23:45 ` Jens Axboe
0 siblings, 1 reply; 4+ messages in thread
From: akpm @ 2021-04-11 22:54 UTC (permalink / raw)
To: akpm, axboe, mm-commits
The patch titled
Subject: fs/io_uring.c: fix build
has been added to the -mm tree. Its filename is
fs-io_uringc-fix-build.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/fs-io_uringc-fix-build.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/fs-io_uringc-fix-build.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: fs/io_uring.c: fix build
hoping this is correct...
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
fs/io_uring.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/fs/io_uring.c~fs-io_uringc-fix-build
+++ a/fs/io_uring.c
@@ -2762,7 +2762,7 @@ static void kiocb_done(struct kiocb *kio
if (check_reissue && req->flags & REQ_F_REISSUE) {
req->flags &= ~REQ_F_REISSUE;
- if (!io_rw_reissue(req)) {
+ if (!io_rw_should_reissue(req)) {
int cflags = 0;
req_set_fail_links(req);
_
Patches currently in -mm which might be from akpm@linux-foundation.org are
scripts-a-new-script-for-checking-duplicate-struct-declaration-fix.patch
mm.patch
mm-memcontrol-switch-to-rstat-fix.patch
mm-vmalloc-remove-unmap_kernel_range-fix-fix.patch
mm-page_alloc-add-an-array-based-interface-to-the-bulk-page-allocator-fix.patch
mm-vmscan-add-shrinker_info_protected-helper-fix.patch
mmmemory_hotplug-allocate-memmap-from-the-added-memory-range-fix.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
fs-io_uringc-fix-build.patch
kernel-forkc-export-kernel_thread-to-modules.patch
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: + fs-io_uringc-fix-build.patch added to -mm tree
2021-04-11 22:54 + fs-io_uringc-fix-build.patch added to -mm tree akpm
@ 2021-04-11 23:45 ` Jens Axboe
0 siblings, 0 replies; 4+ messages in thread
From: Jens Axboe @ 2021-04-11 23:45 UTC (permalink / raw)
To: akpm, mm-commits
On 4/11/21 4:54 PM, akpm@linux-foundation.org wrote:
> The patch titled
> Subject: fs/io_uring.c: fix build
> has been added to the -mm tree. Its filename is
> fs-io_uringc-fix-build.patch
>
> This patch should soon appear at
> https://ozlabs.org/~akpm/mmots/broken-out/fs-io_uringc-fix-build.patch
> and later at
> https://ozlabs.org/~akpm/mmotm/broken-out/fs-io_uringc-fix-build.patch
>
> Before you just go and hit "reply", please:
> a) Consider who else should be cc'ed
> b) Prefer to cc a suitable mailing list as well
> c) Ideally: find the original patch on the mailing list and do a
> reply-to-all to that, adding suitable additional cc's
>
> *** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
>
> The -mm tree is included into linux-next and is updated
> there every 3-4 working days
>
> ------------------------------------------------------
> From: Andrew Morton <akpm@linux-foundation.org>
> Subject: fs/io_uring.c: fix build
>
> hoping this is correct...
That's pretty broken :-)
I just updated the branches (and my for-next), so you should be able to
drop that one again.
--
Jens Axboe
^ permalink raw reply [flat|nested] 4+ messages in thread
* + fs-io_uringc-fix-build.patch added to -mm tree
@ 2021-04-12 2:17 akpm
2021-04-12 2:18 ` Jens Axboe
0 siblings, 1 reply; 4+ messages in thread
From: akpm @ 2021-04-12 2:17 UTC (permalink / raw)
To: mm-commits, axboe
The patch titled
Subject: fs-io_uringc-fix-build
has been added to the -mm tree. Its filename is
fs-io_uringc-fix-build.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/fs-io_uringc-fix-build.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/fs-io_uringc-fix-build.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Jens Axboe <axboe@kernel.dk>
Subject: fs-io_uringc-fix-build
Here's the bit from the incremental:
Link: https://lkml.kernel.org/r/8bf7c0e9-5ba8-9f35-cefa-4c7b1055eaa0@kernel.dk
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
fs/io_uring.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/fs/io_uring.c~fs-io_uringc-fix-build
+++ a/fs/io_uring.c
@@ -2762,7 +2762,11 @@ static void kiocb_done(struct kiocb *kio
if (check_reissue && req->flags & REQ_F_REISSUE) {
req->flags &= ~REQ_F_REISSUE;
- if (!io_rw_reissue(req)) {
+
+ if (io_resubmit_prep(req)) {
+ req_ref_get(req);
+ io_queue_async_work(req);
+ } else {
int cflags = 0;
req_set_fail_links(req);
_
Patches currently in -mm which might be from axboe@kernel.dk are
mm-provide-filemap_range_needs_writeback-helper.patch
mm-use-filemap_range_needs_writeback-for-o_direct-reads.patch
iomap-use-filemap_range_needs_writeback-for-o_direct-reads.patch
fs-io_uringc-fix-build.patch
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: + fs-io_uringc-fix-build.patch added to -mm tree
2021-04-12 2:17 akpm
@ 2021-04-12 2:18 ` Jens Axboe
0 siblings, 0 replies; 4+ messages in thread
From: Jens Axboe @ 2021-04-12 2:18 UTC (permalink / raw)
To: akpm, mm-commits
On 4/11/21 8:17 PM, akpm@linux-foundation.org wrote:
> The patch titled
> Subject: fs-io_uringc-fix-build
> has been added to the -mm tree. Its filename is
> fs-io_uringc-fix-build.patch
>
> This patch should soon appear at
> https://ozlabs.org/~akpm/mmots/broken-out/fs-io_uringc-fix-build.patch
> and later at
> https://ozlabs.org/~akpm/mmotm/broken-out/fs-io_uringc-fix-build.patch
>
> Before you just go and hit "reply", please:
> a) Consider who else should be cc'ed
> b) Prefer to cc a suitable mailing list as well
> c) Ideally: find the original patch on the mailing list and do a
> reply-to-all to that, adding suitable additional cc's
>
> *** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
>
> The -mm tree is included into linux-next and is updated
> there every 3-4 working days
>
> ------------------------------------------------------
> From: Jens Axboe <axboe@kernel.dk>
> Subject: fs-io_uringc-fix-build
>
> Here's the bit from the incremental:
>
> Link: https://lkml.kernel.org/r/8bf7c0e9-5ba8-9f35-cefa-4c7b1055eaa0@kernel.dk
>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
>
> fs/io_uring.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> --- a/fs/io_uring.c~fs-io_uringc-fix-build
> +++ a/fs/io_uring.c
> @@ -2762,7 +2762,11 @@ static void kiocb_done(struct kiocb *kio
>
> if (check_reissue && req->flags & REQ_F_REISSUE) {
> req->flags &= ~REQ_F_REISSUE;
> - if (!io_rw_reissue(req)) {
> +
> + if (io_resubmit_prep(req)) {
> + req_ref_get(req);
> + io_queue_async_work(req);
> + } else {
> int cflags = 0;
>
> req_set_fail_links(req);
LGTM!
--
Jens Axboe
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-04-12 2:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-11 22:54 + fs-io_uringc-fix-build.patch added to -mm tree akpm
2021-04-11 23:45 ` Jens Axboe
2021-04-12 2:17 akpm
2021-04-12 2:18 ` Jens Axboe
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).