APPLIED: [J][PATCH] UBUNTU: SAUCE: overlayfs: remove CONFIG_AUFS_FS dependency

[Stefan Bader]

On 05.08.22 08:32, Andrea Righi wrote:
> From: Alexander Mikhalitsyn <alexander.mikhalitsyn at virtuozzo.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1983640
> 
> 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.
> 
> Fixes: b07bc17b ("UBUNTU: SAUCE: overlayfs: fix incorrect mnt_id of files opened from map_files")
> Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn at virtuozzo.com>
> Signed-off-by: Andrea Righi <andrea.righi at canonical.com>
> ---

Applied to jammy:linux/master-next. Thanks.

-Stefan

>   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)
>   {

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20220823/e2943df6/attachment.sig>