diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-01-30 11:49:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-01-30 11:49:35 +0000 |
| commit | 24c8cacaeeb838b4e865232a097734587387c25e (patch) | |
| tree | 85aec1ddb416b952c2ee01a31af80be79057b493 /android-mainline/ANDROID-Revert-io_uring-rely-solely-on-FMODE_NOWAIT.patch | |
| parent | 5de992082bdd145349c27a08b9f3cd790b0de472 (diff) | |
| parent | 14e18ccfb620e16c79ec180886b4af5355e7b851 (diff) | |
| download | common-patches-24c8cacaeeb838b4e865232a097734587387c25e.tar.gz | |
Merge "aosp/android-mainline: update series (rebase onto v6.7-rc5)" into main
Diffstat (limited to 'android-mainline/ANDROID-Revert-io_uring-rely-solely-on-FMODE_NOWAIT.patch')
| -rw-r--r-- | android-mainline/ANDROID-Revert-io_uring-rely-solely-on-FMODE_NOWAIT.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android-mainline/ANDROID-Revert-io_uring-rely-solely-on-FMODE_NOWAIT.patch b/android-mainline/ANDROID-Revert-io_uring-rely-solely-on-FMODE_NOWAIT.patch index 0b015060..62d2b7e9 100644 --- a/android-mainline/ANDROID-Revert-io_uring-rely-solely-on-FMODE_NOWAIT.patch +++ b/android-mainline/ANDROID-Revert-io_uring-rely-solely-on-FMODE_NOWAIT.patch @@ -27,7 +27,7 @@ Signed-off-by: Lee Jones <joneslee@google.com> diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c -@@ -1761,6 +1761,11 @@ static void io_iopoll_req_issued(struct io_kiocb *req, unsigned int issue_flags) +@@ -1763,6 +1763,11 @@ static void io_iopoll_req_issued(struct io_kiocb *req, unsigned int issue_flags) } } @@ -39,7 +39,7 @@ diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c /* * If we tracked the file through the SCM inflight mechanism, we could support * any file. For now, just ensure that anything potentially problematic is done -@@ -1768,6 +1773,22 @@ static void io_iopoll_req_issued(struct io_kiocb *req, unsigned int issue_flags) +@@ -1770,6 +1775,22 @@ static void io_iopoll_req_issued(struct io_kiocb *req, unsigned int issue_flags) */ static bool __io_file_supports_nowait(struct file *file, umode_t mode) { |