[CRIU] APPLIED[F/E]/cmnt: [SRU][UNSTABLE/BIONIC/XENIAL][PATCH] UBUNTU: SAUCE: overlayfs: use shiftfs hacks only with shiftfs as underlay

[Kleber Souza]

On 27.04.20 15:16, Christian Brauner wrote:
> On Mon, Apr 27, 2020 at 03:10:18PM +0200, Kleber Souza wrote:
>> On 27.04.20 01:02, Khaled Elmously wrote:
>>> Looks like this patch breaks the Eoan build:
>>>
>>> /tmp/kernel-kmously-e9d4a02-jZGj/build/fs/overlayfs/file.c: In function 'ovl_open_realfile':
>>> /tmp/kernel-kmously-e9d4a02-jZGj/build/fs/overlayfs/file.c:34:40: error: 'SHIFTFS_MAGIC' undeclared (first use in this function)
>>>    34 |  if (realpath.dentry->d_sb->s_magic == SHIFTFS_MAGIC)
>>>       |                                        ^~~~~~~~~~~~~
>>> /tmp/kernel-kmously-e9d4a02-jZGj/build/fs/overlayfs/file.c:34:40: note: each undeclared identifier is reported only once for each function it appears in
>>
>> Christian,
>>
>> This seems to fix it:
>>
>> diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c
>> index 30f35c53ce04..a2faa086ee4b 100644
>> --- a/fs/overlayfs/file.c
>> +++ b/fs/overlayfs/file.c
>> @@ -3,6 +3,7 @@
>>   * Copyright (C) 2017 Red Hat, Inc.
>>   */
>>  
>> +#include <uapi/linux/magic.h>
>>  #include <linux/cred.h>
>>  #include <linux/file.h>
>>  #include <linux/mount.h>
>>
>>
>> Would you agree in me amending your patch to fix it?
> 
> Yes, please that would be great! Thanks for fixing this and sorry for
> the noise!
> 
> Christian
> 

Patch amended on both Focal and Eoan.


Thanks,
Kleber