diff for duplicates of <20180907095132.GC13327@kroah.com> diff --git a/a/1.txt b/N1/1.txt index e93c18c..1d3f436 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -50,8 +50,8 @@ On Thu, Aug 02, 2018 at 08:29:02AM -0700, Mark Salyzyn wrote: > > Fix this by hashing non-dir overlay inodes by lower real inode in > the following cases that were not hashed before this change: -> - A non-upper overlay mount -> - A lower non-hardlink when index=off +> �- A non-upper overlay mount +> �- A lower non-hardlink when index=off > > A helper ovl_hash_bylower() was added to put all the logic and > documentation about which real inode an overlay inode is hashed by @@ -65,21 +65,21 @@ On Thu, Aug 02, 2018 at 08:29:02AM -0700, Mark Salyzyn wrote: > Cc: <stable@vger.kernel.org> #v4.13 > Signed-off-by: Mark Salyzyn <salyzyn@android.com> #v4.14 > --- -> fs/overlayfs/inode.c | 62 +++++++++++++++++++++++++++++++------------- -> 1 file changed, 44 insertions(+), 18 deletions(-) +> �fs/overlayfs/inode.c | 62 +++++++++++++++++++++++++++++++------------- +> �1 file changed, 44 insertions(+), 18 deletions(-) > > diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c > index 28a320464609a..7cfef4152e9a4 100644 > --- a/fs/overlayfs/inode.c > +++ b/fs/overlayfs/inode.c > @@ -14,6 +14,7 @@ -> #include <linux/posix_acl.h> -> #include <linux/ratelimit.h> -> #include "overlayfs.h" +> �#include <linux/posix_acl.h> +> �#include <linux/ratelimit.h> +> �#include "overlayfs.h" > +#include "ovl_entry.h" > -> int ovl_setattr(struct dentry *dentry, struct iattr *attr) -> { +> �int ovl_setattr(struct dentry *dentry, struct iattr *attr) +> �{ > @@ -608,39 +609,63 @@ static bool ovl_verify_inode(struct inode *inode, > struct dentry *lowerdentry, diff --git a/a/content_digest b/N1/content_digest index 39bb1e3..6347bb0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -63,8 +63,8 @@ "> \n" "> Fix this by hashing non-dir overlay inodes by lower real inode in\n" "> the following cases that were not hashed before this change:\n" - "> \302\240- A non-upper overlay mount\n" - "> \302\240- A lower non-hardlink when index=off\n" + "> \303\257\302\277\302\275- A non-upper overlay mount\n" + "> \303\257\302\277\302\275- A lower non-hardlink when index=off\n" "> \n" "> A helper ovl_hash_bylower() was added to put all the logic and\n" "> documentation about which real inode an overlay inode is hashed by\n" @@ -78,21 +78,21 @@ "> Cc: <stable@vger.kernel.org> #v4.13\n" "> Signed-off-by: Mark Salyzyn <salyzyn@android.com> #v4.14\n" "> ---\n" - "> \302\240fs/overlayfs/inode.c | 62 +++++++++++++++++++++++++++++++-------------\n" - "> \302\2401 file changed, 44 insertions(+), 18 deletions(-)\n" + "> \303\257\302\277\302\275fs/overlayfs/inode.c | 62 +++++++++++++++++++++++++++++++-------------\n" + "> \303\257\302\277\302\2751 file changed, 44 insertions(+), 18 deletions(-)\n" "> \n" "> diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c\n" "> index 28a320464609a..7cfef4152e9a4 100644\n" "> --- a/fs/overlayfs/inode.c\n" "> +++ b/fs/overlayfs/inode.c\n" "> @@ -14,6 +14,7 @@\n" - "> \302\240#include <linux/posix_acl.h>\n" - "> \302\240#include <linux/ratelimit.h>\n" - "> \302\240#include \"overlayfs.h\"\n" + "> \303\257\302\277\302\275#include <linux/posix_acl.h>\n" + "> \303\257\302\277\302\275#include <linux/ratelimit.h>\n" + "> \303\257\302\277\302\275#include \"overlayfs.h\"\n" "> +#include \"ovl_entry.h\"\n" "> \n" - "> \302\240int ovl_setattr(struct dentry *dentry, struct iattr *attr)\n" - "> \302\240{\n" + "> \303\257\302\277\302\275int ovl_setattr(struct dentry *dentry, struct iattr *attr)\n" + "> \303\257\302\277\302\275{\n" "> @@ -608,39 +609,63 @@ static bool ovl_verify_inode(struct inode *inode,\n" "> struct dentry *lowerdentry,\n" "\n" @@ -103,4 +103,4 @@ "\n" greg k-h -1fa44581c8a734d5b8802ae0d5e00756ec8afc5de906f08f4da8be236626a96c +6a259b47b2aeaf445251119360e0243959290d0d6bbfb7d461d2f8b66d7f788b
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.