diff for duplicates of <20211019134204.3382645-18-agruenba@redhat.com>
diff --git a/a/1.txt b/N1/1.txt
index 0444189..73973e1 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -168,4 +168,10 @@ index ae06defcf369..a8e440b4d21c 100644
static ssize_t gfs2_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
--
-2.26.3
\ No newline at end of file
+2.26.3
+
+
+_______________________________________________
+Ocfs2-devel mailing list
+Ocfs2-devel@oss.oracle.com
+https://oss.oracle.com/mailman/listinfo/ocfs2-devel
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 1dac340..de70324 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,7 +5,7 @@
"From\0Andreas Gruenbacher <agruenba\@redhat.com>\0"
]
[
- "Subject\0[PATCH v8 17/17] gfs2: Fix mmap + page fault deadlocks for direct I/O\0"
+ "Subject\0[Ocfs2-devel] [PATCH v8 17/17] gfs2: Fix mmap + page fault deadlocks for direct I/O\0"
]
[
"Date\0Tue, 19 Oct 2021 15:42:04 +0200\0"
@@ -15,19 +15,17 @@
" Catalin Marinas <catalin.marinas\@arm.com>\0"
]
[
- "Cc\0Alexander Viro <viro\@zeniv.linux.org.uk>",
- " Christoph Hellwig <hch\@infradead.org>",
- " Darrick J. Wong <djwong\@kernel.org>",
+ "Cc\0kvm-ppc\@vger.kernel.org",
" Paul Mackerras <paulus\@ozlabs.org>",
- " Jan Kara <jack\@suse.cz>",
- " Matthew Wilcox <willy\@infradead.org>",
" cluster-devel\@redhat.com",
- " linux-fsdevel\@vger.kernel.org",
+ " Jan Kara <jack\@suse.cz>",
+ " Andreas Gruenbacher <agruenba\@redhat.com>",
" linux-kernel\@vger.kernel.org",
- " ocfs2-devel\@oss.oracle.com",
- " kvm-ppc\@vger.kernel.org",
+ " Christoph Hellwig <hch\@infradead.org>",
+ " Alexander Viro <viro\@zeniv.linux.org.uk>",
+ " linux-fsdevel\@vger.kernel.org",
" linux-btrfs\@vger.kernel.org",
- " Andreas Gruenbacher <agruenba\@redhat.com>\0"
+ " ocfs2-devel\@oss.oracle.com\0"
]
[
"\0000:1\0"
@@ -206,7 +204,13 @@
" \n",
" static ssize_t gfs2_file_read_iter(struct kiocb *iocb, struct iov_iter *to)\n",
"-- \n",
- "2.26.3"
+ "2.26.3\n",
+ "\n",
+ "\n",
+ "_______________________________________________\n",
+ "Ocfs2-devel mailing list\n",
+ "Ocfs2-devel\@oss.oracle.com\n",
+ "https://oss.oracle.com/mailman/listinfo/ocfs2-devel"
]
-3c33a508783112c51bba180b5ab3687e65e4eb4897d9fe5a67292ba341fc514f
+ff6a7a8d7dc98a9f7770e440b942290f8e22ffc78382ba5b21dbce24d7aebc21
diff --git a/a/content_digest b/N2/content_digest
index 1dac340..c1c6952 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -5,29 +5,13 @@
"From\0Andreas Gruenbacher <agruenba\@redhat.com>\0"
]
[
- "Subject\0[PATCH v8 17/17] gfs2: Fix mmap + page fault deadlocks for direct I/O\0"
+ "Subject\0[Cluster-devel] [PATCH v8 17/17] gfs2: Fix mmap + page fault deadlocks for direct I/O\0"
]
[
"Date\0Tue, 19 Oct 2021 15:42:04 +0200\0"
]
[
- "To\0Linus Torvalds <torvalds\@linux-foundation.org>",
- " Catalin Marinas <catalin.marinas\@arm.com>\0"
-]
-[
- "Cc\0Alexander Viro <viro\@zeniv.linux.org.uk>",
- " Christoph Hellwig <hch\@infradead.org>",
- " Darrick J. Wong <djwong\@kernel.org>",
- " Paul Mackerras <paulus\@ozlabs.org>",
- " Jan Kara <jack\@suse.cz>",
- " Matthew Wilcox <willy\@infradead.org>",
- " cluster-devel\@redhat.com",
- " linux-fsdevel\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " ocfs2-devel\@oss.oracle.com",
- " kvm-ppc\@vger.kernel.org",
- " linux-btrfs\@vger.kernel.org",
- " Andreas Gruenbacher <agruenba\@redhat.com>\0"
+ "To\0cluster-devel.redhat.com\0"
]
[
"\0000:1\0"
@@ -209,4 +193,4 @@
"2.26.3"
]
-3c33a508783112c51bba180b5ab3687e65e4eb4897d9fe5a67292ba341fc514f
+9fa9185248dd5ca06a332ea630af4995b2f87053bda6bba09e7f0f0fb34d54e7
diff --git a/a/1.txt b/N3/1.txt
index 0444189..912d5c0 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -68,7 +68,7 @@ index ae06defcf369..a8e440b4d21c 100644
- ret = iomap_dio_rw(iocb, to, &gfs2_iomap_ops, NULL, 0, 0);
- gfs2_glock_dq(gh);
-+ if (unlikely(iov_iter_count(to) && (ret > 0 || ret == -EFAULT)) &&
++ if (unlikely(iov_iter_count(to) && (ret > 0 || ret = -EFAULT)) &&
+ should_fault_in_pages(to, &prev_count, &window_size)) {
+ size_t leftover;
+
@@ -136,12 +136,12 @@ index ae06defcf369..a8e440b4d21c 100644
+ IOMAP_DIO_PARTIAL, read);
+ from->nofault = false;
+
- if (ret == -ENOTBLK)
+ if (ret = -ENOTBLK)
ret = 0;
+ if (ret > 0)
+ read = ret;
+
-+ if (unlikely(iov_iter_count(from) && (ret > 0 || ret == -EFAULT)) &&
++ if (unlikely(iov_iter_count(from) && (ret > 0 || ret = -EFAULT)) &&
+ should_fault_in_pages(from, &prev_count, &window_size)) {
+ size_t leftover;
+
diff --git a/a/content_digest b/N3/content_digest
index 1dac340..b315cb3 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v8 17/17] gfs2: Fix mmap + page fault deadlocks for direct I/O\0"
]
[
- "Date\0Tue, 19 Oct 2021 15:42:04 +0200\0"
+ "Date\0Tue, 19 Oct 2021 13:42:04 +0000\0"
]
[
"To\0Linus Torvalds <torvalds\@linux-foundation.org>",
@@ -106,7 +106,7 @@
" \n",
"-\tret = iomap_dio_rw(iocb, to, &gfs2_iomap_ops, NULL, 0, 0);\n",
"-\tgfs2_glock_dq(gh);\n",
- "+\tif (unlikely(iov_iter_count(to) && (ret > 0 || ret == -EFAULT)) &&\n",
+ "+\tif (unlikely(iov_iter_count(to) && (ret > 0 || ret = -EFAULT)) &&\n",
"+\t should_fault_in_pages(to, &prev_count, &window_size)) {\n",
"+\t\tsize_t leftover;\n",
"+\n",
@@ -174,12 +174,12 @@
"+\t\t\t IOMAP_DIO_PARTIAL, read);\n",
"+\tfrom->nofault = false;\n",
"+\n",
- " \tif (ret == -ENOTBLK)\n",
+ " \tif (ret = -ENOTBLK)\n",
" \t\tret = 0;\n",
"+\tif (ret > 0)\n",
"+\t\tread = ret;\n",
"+\n",
- "+\tif (unlikely(iov_iter_count(from) && (ret > 0 || ret == -EFAULT)) &&\n",
+ "+\tif (unlikely(iov_iter_count(from) && (ret > 0 || ret = -EFAULT)) &&\n",
"+\t should_fault_in_pages(from, &prev_count, &window_size)) {\n",
"+\t\tsize_t leftover;\n",
"+\n",
@@ -209,4 +209,4 @@
"2.26.3"
]
-3c33a508783112c51bba180b5ab3687e65e4eb4897d9fe5a67292ba341fc514f
+7c0e56c8a9cbf2665c57d4aa2075907e847995c2108d119b7c0366e311b16472
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.