diff for duplicates of <CAL3q7H7mLvCGpyitJhQ=To-aDvG9k9rxSVi2jSpcALQVj3myzg@mail.gmail.com>
diff --git a/a/1.txt b/N1/1.txt
index 524181c..22d8d59 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,4 +1,5 @@
-On Thu, Oct 11, 2018 at 5:13 AM Darrick J. Wong <darrick.wong@oracle.com> wrote:
+On Thu, Oct 11, 2018 at 5:13 AM Darrick J. Wong <darrick.wong@oracle.com> w=
+rote:
>
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
@@ -49,34 +50,39 @@ thanks
> index d6e8e242a15f..8498991e2f33 100644
> --- a/fs/read_write.c
> +++ b/fs/read_write.c
-> @@ -1723,6 +1723,7 @@ int vfs_clone_file_prep(struct file *file_in, loff_t pos_in,
+> @@ -1723,6 +1723,7 @@ int vfs_clone_file_prep(struct file *file_in, loff_=
+t pos_in,
> {
-> struct inode *inode_in = file_inode(file_in);
-> struct inode *inode_out = file_inode(file_out);
-> + u64 blkmask = i_blocksize(inode_in) - 1;
-> bool same_inode = (inode_in == inode_out);
+> struct inode *inode_in =3D file_inode(file_in);
+> struct inode *inode_out =3D file_inode(file_out);
+> + u64 blkmask =3D i_blocksize(inode_in) - 1;
+> bool same_inode =3D (inode_in =3D=3D inode_out);
> int ret;
>
-> @@ -1785,6 +1786,27 @@ int vfs_clone_file_prep(struct file *file_in, loff_t pos_in,
+> @@ -1785,6 +1786,27 @@ int vfs_clone_file_prep(struct file *file_in, loff=
+_t pos_in,
> return -EBADE;
> }
>
> + /* Are we doing a partial EOF block remapping of some kind? */
> + if (*len & blkmask) {
> + /*
-> + * If the dedupe data matches, don't try to dedupe the partial
+> + * If the dedupe data matches, don't try to dedupe the pa=
+rtial
> + * EOF block.
> + *
-> + * If the user is attempting to remap a partial EOF block and
+> + * If the user is attempting to remap a partial EOF block=
+ and
> + * it's inside the destination EOF then reject it.
> + *
-> + * We don't support shortening requests, so we can only reject
+> + * We don't support shortening requests, so we can only r=
+eject
> + * them.
> + */
> + if (is_dedupe)
-> + ret = -EBADE;
+> + ret =3D -EBADE;
> + else if (pos_out + *len < i_size_read(inode_out))
-> + ret = -EINVAL;
+> + ret =3D -EINVAL;
> +
> + if (ret)
> + return ret;
@@ -88,7 +94,8 @@ thanks
>
---
+--=20
Filipe David Manana,
-“Whether you think you can, or you think you can't — you're right.”
\ No newline at end of file
+=E2=80=9CWhether you think you can, or you think you can't =E2=80=94 you're=
+ right.=E2=80=9D
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 10b7d4d..986d9c9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -35,7 +35,8 @@
"b\0"
]
[
- "On Thu, Oct 11, 2018 at 5:13 AM Darrick J. Wong <darrick.wong\@oracle.com> wrote:\n",
+ "On Thu, Oct 11, 2018 at 5:13 AM Darrick J. Wong <darrick.wong\@oracle.com> w=\n",
+ "rote:\n",
">\n",
"> From: Darrick J. Wong <darrick.wong\@oracle.com>\n",
">\n",
@@ -86,34 +87,39 @@
"> index d6e8e242a15f..8498991e2f33 100644\n",
"> --- a/fs/read_write.c\n",
"> +++ b/fs/read_write.c\n",
- "> \@\@ -1723,6 +1723,7 \@\@ int vfs_clone_file_prep(struct file *file_in, loff_t pos_in,\n",
+ "> \@\@ -1723,6 +1723,7 \@\@ int vfs_clone_file_prep(struct file *file_in, loff_=\n",
+ "t pos_in,\n",
"> {\n",
- "> struct inode *inode_in = file_inode(file_in);\n",
- "> struct inode *inode_out = file_inode(file_out);\n",
- "> + u64 blkmask = i_blocksize(inode_in) - 1;\n",
- "> bool same_inode = (inode_in == inode_out);\n",
+ "> struct inode *inode_in =3D file_inode(file_in);\n",
+ "> struct inode *inode_out =3D file_inode(file_out);\n",
+ "> + u64 blkmask =3D i_blocksize(inode_in) - 1;\n",
+ "> bool same_inode =3D (inode_in =3D=3D inode_out);\n",
"> int ret;\n",
">\n",
- "> \@\@ -1785,6 +1786,27 \@\@ int vfs_clone_file_prep(struct file *file_in, loff_t pos_in,\n",
+ "> \@\@ -1785,6 +1786,27 \@\@ int vfs_clone_file_prep(struct file *file_in, loff=\n",
+ "_t pos_in,\n",
"> return -EBADE;\n",
"> }\n",
">\n",
"> + /* Are we doing a partial EOF block remapping of some kind? */\n",
"> + if (*len & blkmask) {\n",
"> + /*\n",
- "> + * If the dedupe data matches, don't try to dedupe the partial\n",
+ "> + * If the dedupe data matches, don't try to dedupe the pa=\n",
+ "rtial\n",
"> + * EOF block.\n",
"> + *\n",
- "> + * If the user is attempting to remap a partial EOF block and\n",
+ "> + * If the user is attempting to remap a partial EOF block=\n",
+ " and\n",
"> + * it's inside the destination EOF then reject it.\n",
"> + *\n",
- "> + * We don't support shortening requests, so we can only reject\n",
+ "> + * We don't support shortening requests, so we can only r=\n",
+ "eject\n",
"> + * them.\n",
"> + */\n",
"> + if (is_dedupe)\n",
- "> + ret = -EBADE;\n",
+ "> + ret =3D -EBADE;\n",
"> + else if (pos_out + *len < i_size_read(inode_out))\n",
- "> + ret = -EINVAL;\n",
+ "> + ret =3D -EINVAL;\n",
"> +\n",
"> + if (ret)\n",
"> + return ret;\n",
@@ -125,10 +131,11 @@
">\n",
"\n",
"\n",
- "-- \n",
+ "--=20\n",
"Filipe David Manana,\n",
"\n",
- "\342\200\234Whether you think you can, or you think you can't \342\200\224 you're right.\342\200\235"
+ "=E2=80=9CWhether you think you can, or you think you can't =E2=80=94 you're=\n",
+ " right.=E2=80=9D"
]
-dca464a36ded4c3c78c7d6de815289a789f8130d310e1d7847e4a13ad78eee35
+d46579497d8b8ee6c09340490cbda0a690c71ff5df07e929ba5596b938a3f669
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.