From a40994fd0ee0bcf9aaf7ee7ade6a76d06ec32953 Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Tue, 2 Aug 2022 00:19:26 +0300 Subject: [SRU][J][master-next][PATCH] UBUNTU: SAUCE: overlayfs: remove CONFIG_AUFS_FS dependency BugLink: https://bugs.launchpad.net/bugs/1967924 BugLink: https://bugs.launchpad.net/bugs/1857257 BugLink: https://bugs.launchpad.net/bugs/1967924 Right now we have a fix: b07bc17b ("UBUNTU: SAUCE: overlayfs: fix incorrect mnt_id of files opened from map_files") in master branch of Jammy kernel, but only formaly. Because these kernels compiled without CONFIG_AUFS_FS set, so this fix just disabled. There is no need to make it dependent on CONFIG_AUFS_FS option, because in all cases we have mm/prfile.c compiled-in. Cc: Andrei Vagin Cc: Adrian Reber Cc: Christian Brauner Cc: Stefan Bader Cc: Kleber Sacilotto de Souza Cc: Krzysztof Kozlowski Cc: Andrea Righi Fixes: b07bc17b ("UBUNTU: SAUCE: overlayfs: fix incorrect mnt_id of files opened from map_files") Signed-off-by: Alexander Mikhalitsyn --- fs/overlayfs/file.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c index 2e4ebebdb7d1..7024771dcae8 100644 --- a/fs/overlayfs/file.c +++ b/fs/overlayfs/file.c @@ -490,7 +490,6 @@ static int ovl_fsync(struct file *file, loff_t start, loff_t end, int datasync) return ret; } -#if IS_ENABLED(CONFIG_AUFS_FS) /* * In map_files_get_link() (fs/proc/base.c) * we need to determine correct path from overlayfs. @@ -516,12 +515,6 @@ static void ovl_vm_prfile_set(struct vm_area_struct *vma, vma->vm_region->vm_prfile = file; #endif } -#else /* !CONFIG_AUFS_FS */ -static void ovl_vm_prfile_set(struct vm_area_struct *vma, - struct file *file) -{ -} -#endif/* CONFIG_AUFS_FS */ static int ovl_mmap(struct file *file, struct vm_area_struct *vma) { -- 2.36.1