From d8740a92c10d229c4ff60c174e0a2c6f095e21a1 Mon Sep 17 00:00:00 2001 From: Stoiko Ivanov Date: Thu, 7 Mar 2019 18:03:51 +0100 Subject: [PATCH] spl: drop patch already contained in 0.7.13 Signed-off-by: Stoiko Ivanov --- ...-mm_sem-and-tx-assign-in-zfs_write-a.patch | 42 ------------------- spl/debian/patches/series | 1 - 2 files changed, 43 deletions(-) delete mode 100644 spl/debian/patches/0001-deadlock-between-mm_sem-and-tx-assign-in-zfs_write-a.patch delete mode 100644 spl/debian/patches/series diff --git a/spl/debian/patches/0001-deadlock-between-mm_sem-and-tx-assign-in-zfs_write-a.patch b/spl/debian/patches/0001-deadlock-between-mm_sem-and-tx-assign-in-zfs_write-a.patch deleted file mode 100644 index 2906ef8..0000000 --- a/spl/debian/patches/0001-deadlock-between-mm_sem-and-tx-assign-in-zfs_write-a.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: ilbsmart -Date: Wed, 17 Oct 2018 02:11:24 +0800 -Subject: [PATCH] deadlock between mm_sem and tx assign in zfs_write() and page - fault - -The bug time sequence: -1. thread #1, `zfs_write` assign a txg "n". -2. In a same process, thread #2, mmap page fault (which means the - `mm_sem` is hold) occurred, `zfs_dirty_inode` open a txg failed, - and wait previous txg "n" completed. -3. thread #1 call `uiomove` to write, however page fault is occurred - in `uiomove`, which means it need `mm_sem`, but `mm_sem` is hold by - thread #2, so it stuck and can't complete, then txg "n" will - not complete. - -So thread #1 and thread #2 are deadlocked. - -Reviewed-by: Chunwei Chen -Reviewed-by: Brian Behlendorf -Reviewed-by: Matthew Ahrens -Signed-off-by: Grady Wong -Closes #7939 - -(backported from: zfs-upstream 779a6c0bf6df76e0dd92c1ccf81f48512b835bb0) -Signed-off-by: Stoiko Ivanov ---- - include/sys/uio.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/sys/uio.h b/include/sys/uio.h -index 764beb9..2895690 100644 ---- a/include/sys/uio.h -+++ b/include/sys/uio.h -@@ -53,6 +53,7 @@ typedef struct uio { - int uio_iovcnt; - offset_t uio_loffset; - uio_seg_t uio_segflg; -+ boolean_t uio_fault_disable; - uint16_t uio_fmode; - uint16_t uio_extflg; - offset_t uio_limit; diff --git a/spl/debian/patches/series b/spl/debian/patches/series deleted file mode 100644 index 9b4596f..0000000 --- a/spl/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-deadlock-between-mm_sem-and-tx-assign-in-zfs_write-a.patch