diff for duplicates of <24a46ae8-6e50-2f45-f099-45743bb013c4@linux.alibaba.com>

diff --git a/a/1.txt b/N1/1.txt
index 8ee4218..8f97ee0 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -7,16 +7,16 @@ On 2023/3/10 11:42, Gao Xiang wrote:
 >> On Thu, Mar 09, 2023 at 11:21:23PM +0800, Yangtao Li wrote:
 >>> Use i_blockmask() to simplify code.
 >>
->> Umm...? What's the branchpoint for that series?? Not the mainline -
+>> Umm...  What's the branchpoint for that series?  Not the mainline -
 >> there we have i_blocksize() open-coded...
 > 
 > Actually Yue Hu sent out a clean-up patch and I applied to -next for
 > almost a week and will be upstreamed for 6.3-rc2:
 > 
-> https://lore.kernel.org/r/a238dca1-256f-ae2f-4a33-e54861fe4ffb at kernel.org/T/#t
+> https://lore.kernel.org/r/a238dca1-256f-ae2f-4a33-e54861fe4ffb@kernel.org/T/#t
 
 Sorry this link:
-https://lore.kernel.org/r/0261de31-e98b-85cd-80de-96af5a76e15c at linux.alibaba.com
+https://lore.kernel.org/r/0261de31-e98b-85cd-80de-96af5a76e15c@linux.alibaba.com
 
 Yangtao's suggestion was to use GENMASK, and I'm not sure it's a good way
 since (i_blocksize(inode) - 1) is simple enough, and then it becomes like
@@ -41,21 +41,21 @@ Gao Xiang
 >>> -none
 >>> v2:
 >>> -convert to i_blockmask()
->>> ? fs/erofs/data.c | 2 +-
->>> ? 1 file changed, 1 insertion(+), 1 deletion(-)
+>>>   fs/erofs/data.c | 2 +-
+>>>   1 file changed, 1 insertion(+), 1 deletion(-)
 >>>
 >>> diff --git a/fs/erofs/data.c b/fs/erofs/data.c
 >>> index 7e8baf56faa5..e9d1869cd4b3 100644
 >>> --- a/fs/erofs/data.c
 >>> +++ b/fs/erofs/data.c
 >>> @@ -380,7 +380,7 @@ static ssize_t erofs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
->>> ????????? if (bdev)
->>> ????????????? blksize_mask = bdev_logical_block_size(bdev) - 1;
->>> ????????? else
->>> -??????????? blksize_mask = i_blocksize(inode) - 1;
->>> +??????????? blksize_mask = i_blockmask(inode);
->>> ????????? if ((iocb->ki_pos | iov_iter_count(to) |
->>> ?????????????? iov_iter_alignment(to)) & blksize_mask)
+>>>           if (bdev)
+>>>               blksize_mask = bdev_logical_block_size(bdev) - 1;
+>>>           else
+>>> -            blksize_mask = i_blocksize(inode) - 1;
+>>> +            blksize_mask = i_blockmask(inode);
+>>>           if ((iocb->ki_pos | iov_iter_count(to) |
+>>>                iov_iter_alignment(to)) & blksize_mask)
 >>> -- 
 >>> 2.25.1
 >>>
diff --git a/a/content_digest b/N1/content_digest
index 1d89b93..9ee87f8 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,9 +3,25 @@
  "ref\020230310031547.GD3390869@ZenIV\0"
  "ref\02fa31829-03f0-7bfb-a89b-e3917c479733@linux.alibaba.com\0"
  "From\0Gao Xiang <hsiangkao@linux.alibaba.com>\0"
- "Subject\0[Cluster-devel] [PATCH v3 2/6] erofs: convert to use i_blockmask()\0"
+ "Subject\0Re: [PATCH v3 2/6] erofs: convert to use i_blockmask()\0"
  "Date\0Fri, 10 Mar 2023 11:47:38 +0800\0"
- "To\0cluster-devel.redhat.com\0"
+ "To\0Al Viro <viro@zeniv.linux.org.uk>"
+ " Yangtao Li <frank.li@vivo.com>\0"
+ "Cc\0brauner@kernel.org"
+  tytso@mit.edu
+  agruenba@redhat.com
+  joseph.qi@linux.alibaba.com
+  mark@fasheh.com
+  linux-kernel@vger.kernel.org
+  cluster-devel@redhat.com
+  rpeterso@redhat.com
+  huyue2@coolpad.com
+  adilger.kernel@dilger.ca
+  jlbec@evilplan.org
+  linux-fsdevel@vger.kernel.org
+  linux-ext4@vger.kernel.org
+  linux-erofs@lists.ozlabs.org
+ " ocfs2-devel@oss.oracle.com\0"
  "\00:1\0"
  "b\0"
  "\n"
@@ -17,16 +33,16 @@
  ">> On Thu, Mar 09, 2023 at 11:21:23PM +0800, Yangtao Li wrote:\n"
  ">>> Use i_blockmask() to simplify code.\n"
  ">>\n"
- ">> Umm...? What's the branchpoint for that series?? Not the mainline -\n"
+ ">> Umm...\302\240 What's the branchpoint for that series?\302\240 Not the mainline -\n"
  ">> there we have i_blocksize() open-coded...\n"
  "> \n"
  "> Actually Yue Hu sent out a clean-up patch and I applied to -next for\n"
  "> almost a week and will be upstreamed for 6.3-rc2:\n"
  "> \n"
- "> https://lore.kernel.org/r/a238dca1-256f-ae2f-4a33-e54861fe4ffb at kernel.org/T/#t\n"
+ "> https://lore.kernel.org/r/a238dca1-256f-ae2f-4a33-e54861fe4ffb@kernel.org/T/#t\n"
  "\n"
  "Sorry this link:\n"
- "https://lore.kernel.org/r/0261de31-e98b-85cd-80de-96af5a76e15c at linux.alibaba.com\n"
+ "https://lore.kernel.org/r/0261de31-e98b-85cd-80de-96af5a76e15c@linux.alibaba.com\n"
  "\n"
  "Yangtao's suggestion was to use GENMASK, and I'm not sure it's a good way\n"
  "since (i_blocksize(inode) - 1) is simple enough, and then it becomes like\n"
@@ -51,23 +67,23 @@
  ">>> -none\n"
  ">>> v2:\n"
  ">>> -convert to i_blockmask()\n"
- ">>> ? fs/erofs/data.c | 2 +-\n"
- ">>> ? 1 file changed, 1 insertion(+), 1 deletion(-)\n"
+ ">>> \302\240 fs/erofs/data.c | 2 +-\n"
+ ">>> \302\240 1 file changed, 1 insertion(+), 1 deletion(-)\n"
  ">>>\n"
  ">>> diff --git a/fs/erofs/data.c b/fs/erofs/data.c\n"
  ">>> index 7e8baf56faa5..e9d1869cd4b3 100644\n"
  ">>> --- a/fs/erofs/data.c\n"
  ">>> +++ b/fs/erofs/data.c\n"
  ">>> @@ -380,7 +380,7 @@ static ssize_t erofs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)\n"
- ">>> ????????? if (bdev)\n"
- ">>> ????????????? blksize_mask = bdev_logical_block_size(bdev) - 1;\n"
- ">>> ????????? else\n"
- ">>> -??????????? blksize_mask = i_blocksize(inode) - 1;\n"
- ">>> +??????????? blksize_mask = i_blockmask(inode);\n"
- ">>> ????????? if ((iocb->ki_pos | iov_iter_count(to) |\n"
- ">>> ?????????????? iov_iter_alignment(to)) & blksize_mask)\n"
+ ">>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 if (bdev)\n"
+ ">>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 blksize_mask = bdev_logical_block_size(bdev) - 1;\n"
+ ">>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 else\n"
+ ">>> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 blksize_mask = i_blocksize(inode) - 1;\n"
+ ">>> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 blksize_mask = i_blockmask(inode);\n"
+ ">>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 if ((iocb->ki_pos | iov_iter_count(to) |\n"
+ ">>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 iov_iter_alignment(to)) & blksize_mask)\n"
  ">>> -- \n"
  ">>> 2.25.1\n"
  >>>
 
-ba05598fec4852567a93a71ff51e4f0b550041192063d265dd6f385400c7f6fd
+28fc3f569065cc9e13ca749b181f10be812a6c7b43d5d08968b738c2b359efc0
