Add conflicts resolution for block-fs branch for v5.19-rc7
Signed-off-by: Łukasz Bartosik <ukaszb@google.com>
diff --git a/f250de09bef70240b0525a352aa01d7f3c7a961f8bf57c5dbd17430a.patch b/f250de09bef70240b0525a352aa01d7f3c7a961f8bf57c5dbd17430a.patch
index 6ff343d..6903880 100644
--- a/f250de09bef70240b0525a352aa01d7f3c7a961f8bf57c5dbd17430a.patch
+++ b/f250de09bef70240b0525a352aa01d7f3c7a961f8bf57c5dbd17430a.patch
@@ -1,4 +1,4 @@
-From 55a2d4d6751f667b5d1b4d6311d91d9b1ef73232 Mon Sep 17 00:00:00 2001
+From 2df0e06f70f24bf1210b0150ef3163363f577dc8 Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@android.com>
Date: Mon, 15 Jul 2019 15:46:45 -0700
Subject: [PATCH] FROMLIST: overlayfs: handle XATTR_NOSECURITY flag for get
@@ -96,19 +96,19 @@
struct posix_acl *ovl_get_acl(struct inode *inode, int type, bool rcu);
int ovl_update_time(struct inode *inode, struct timespec64 *ts, int flags);
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
-index e0a2e0468ee7..c75f07c7c889 100644
+index 1ce5c9698393..5a990e5eb794 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
-@@ -1003,7 +1003,7 @@ ovl_posix_acl_xattr_get(const struct xattr_handler *handler,
- struct dentry *dentry, struct inode *inode,
- const char *name, void *buffer, size_t size)
- {
+@@ -1006,7 +1006,7 @@ ovl_posix_acl_xattr_get(const struct xattr_handler *handler,
+ if (!IS_POSIXACL(inode))
+ return -EOPNOTSUPP;
+
- return ovl_xattr_get(dentry, inode, handler->name, buffer, size);
+ return ovl_xattr_get(dentry, inode, handler->name, buffer, size, flags);
}
static int __maybe_unused
-@@ -1082,7 +1082,7 @@ static int ovl_other_xattr_get(const struct xattr_handler *handler,
+@@ -1088,7 +1088,7 @@ static int ovl_other_xattr_get(const struct xattr_handler *handler,
struct dentry *dentry, struct inode *inode,
const char *name, void *buffer, size_t size)
{
@@ -118,5 +118,5 @@
static int ovl_other_xattr_set(const struct xattr_handler *handler,
--
-2.36.1.255.ge46751e96f-goog
+2.37.0.170.g444d1eabd0-goog
