summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-04-03 20:55:34 +0200
committerChristian Breunig <christian@breunig.cc>2024-04-03 20:56:07 +0200
commit883e761b419c090f08affe5431a7377cbcc73584 (patch)
tree66b5ef30559dbb7696027cd44484ad172d770a3c
parent02144bc3f8cc4991baac6195922421cb122d1dba (diff)
downloadvyos-build-883e761b419c090f08affe5431a7377cbcc73584.tar.gz
vyos-build-883e761b419c090f08affe5431a7377cbcc73584.zip
Kernel: T5887: rebase inotify patch
(cherry picked from commit 28c08a784ebdddfe56d8d33b4f28b147ad0a5265)
-rw-r--r--packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch b/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch
index 31544af4..b19a8d25 100644
--- a/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch
+++ b/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch
@@ -190,7 +190,7 @@ index 1c4bfdab008d..cf567cc33679 100644
struct inotify_inode_mark *i_mark)
{
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
-index 3fa2416264a4..38930c1e70d8 100644
+index 2c056d737c27..2cb1f0024e70 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -15,6 +15,7 @@
@@ -201,7 +201,7 @@ index 3fa2416264a4..38930c1e70d8 100644
#include <linux/file.h>
#include <linux/fs_context.h>
#include <linux/fs_parser.h>
-@@ -1525,6 +1526,18 @@ static void ovl_inode_init_once(void *foo)
+@@ -1528,6 +1529,18 @@ static void ovl_inode_init_once(void *foo)
inode_init_once(&oi->vfs_inode);
}
@@ -220,7 +220,7 @@ index 3fa2416264a4..38930c1e70d8 100644
static int __init ovl_init(void)
{
int err;
-@@ -1540,18 +1553,24 @@ static int __init ovl_init(void)
+@@ -1543,18 +1556,24 @@ static int __init ovl_init(void)
err = ovl_aio_request_cache_init();
if (!err) {
err = register_filesystem(&ovl_fs_type);