Re: [PATCH] xfs_scrub: fix build with older kernel headers

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On 3/26/18 1:09 PM, Darrick J. Wong wrote:
> On Sun, Mar 25, 2018 at 12:08:17AM +0300, Baruch Siach wrote:
>> The OVERRIDE_SYSTEM_FSXATTR macro in include/linux.h is meant to
>> override the linux/fs.h kernel header provided struct fsxattr for
>> kernels older than v4.7. A few source files include linux/fs.h before
>> the local linux.h, making this override ineffective. Remove these header
>> includes from the source files, and rely on the linux.h include alone.
>>
>> This fixes the following build failures:
>>
>> In file included from ../include/xfs.h:37:0,
>>                  from disk.c:40:
>> ../include/xfs/linux.h:185:8: error: redefinition of 'struct fsxattr'
>>  struct fsxattr {
>>         ^~~~~~~
>>
>> In file included from ../include/xfs.h:37:0,
>>                  from ../include/project.h:22,
>>                  from ../include/input.h:24,
>>                  from phase1.c:38:
>> ../include/xfs/linux.h:185:8: error: redefinition of 'struct fsxattr'
>>  struct fsxattr {
>>         ^~~~~~~
>>
>> Cc: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
>> Signed-off-by: Baruch Siach <baruch@xxxxxxxxxx>
> 
> Looks ok, but I think this is already fixed by commit a440f8773794
> ("xfs_scrub: fix #include ordering to avoid build failure") in for-next.

Agreed, it looks like this is against master & not for-next;
Baruch, can you check out for-next and confirm that it's ok?

Thanks,
-Eric
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [XFS Filesystem Development (older mail)]     [Linux Filesystem Development]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux RAID]     [Linux SCSI]


  Powered by Linux