From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 7686F3858D1E for ; Mon, 26 Jun 2023 13:15:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7686F3858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687785335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oBLu1Tncxp7j6biiwnzfpq5JqP4V30eceyEwB5obY+g=; b=YKe+q+ChDHQwhHKaxw7v4M55dQ4moR7TXEJH4U66sIZ09Ri1hnp0QFhaGafeiO6Br9Bb1Z dxNSv2RnRdPRBB+Z6aoREzuLmi88O6GQUalv7UocxqDmwtQzxBm1JMgptUgd4rf2j8bPfD foDyV46TtkPpHV+8gCOdMpLm5/phwCQ= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-251-OlUI0B4VNcutpKAspk-L5A-1; Mon, 26 Jun 2023 09:15:33 -0400 X-MC-Unique: OlUI0B4VNcutpKAspk-L5A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8FCF58C80FC; Mon, 26 Jun 2023 13:15:31 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.2.16.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1E3032017DE2; Mon, 26 Jun 2023 13:15:30 +0000 (UTC) From: Florian Weimer To: =?utf-8?B?0L3QsNCx?= via Libc-alpha Cc: =?utf-8?B?0L3QsNCx?= Subject: Re: [PATCH 2/2] linux: statvfs: allocate spare for f_type References: <0fd9629f7215d1c43968a900238d03d9275a74fa.1687552604.git.nabijaczleweli@nabijaczleweli.xyz> <169a6ec2a9957495275964afd0697fa3aea1c6b6.1687552604.git.nabijaczleweli@nabijaczleweli.xyz> Date: Mon, 26 Jun 2023 15:15:29 +0200 In-Reply-To: <169a6ec2a9957495275964afd0697fa3aea1c6b6.1687552604.git.nabijaczleweli@nabijaczleweli.xyz> (=?utf-8?B?ItC90LDQsQ==?= via Libc-alpha"'s message of "Fri, 23 Jun 2023 22:37:02 +0200") Message-ID: <87cz1i74b2.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: * =D0=BD=D0=B0=D0=B1 via Libc-alpha: > diff --git a/sysdeps/unix/sysv/linux/bits/statvfs.h b/sysdeps/unix/sysv/l= inux/bits/statvfs.h > index 8dfb5ce761..cf98460e00 100644 > --- a/sysdeps/unix/sysv/linux/bits/statvfs.h > +++ b/sysdeps/unix/sysv/linux/bits/statvfs.h > @@ -51,7 +51,8 @@ struct statvfs > #endif > unsigned long int f_flag; > unsigned long int f_namemax; > - int __f_spare[6]; > + unsigned int f_type; > + int __f_spare[5]; > }; > =20 > #ifdef __USE_LARGEFILE64 > @@ -71,7 +72,8 @@ struct statvfs64 > #endif > unsigned long int f_flag; > unsigned long int f_namemax; > - int __f_spare[6]; > + unsigned int f_type; > + int __f_spare[5]; > }; > #endif I think the caller can check for f_type being zero to check if it has been written by glibc, so this does not require a new symbol version. The previous already initializes __f_spare to zero, and none of the magic values in are zero. This should perhaps have a NEWS entry, though, and a test case. Thanks, Florian