From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752521AbdBOVY3 (ORCPT ); Wed, 15 Feb 2017 16:24:29 -0500 Received: from mx2.suse.de ([195.135.220.15]:57051 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752071AbdBOVY2 (ORCPT ); Wed, 15 Feb 2017 16:24:28 -0500 Subject: Re: [PATCH] uapi: fix linux/btrfs.h userspace compilation error To: "Dmitry V. Levin" , David Sterba , Josef Bacik , Liu Bo , Anand Jain References: <20170215200259.GA1028@altlinux.org> Cc: linux-kernel@vger.kernel.org From: Jeff Mahoney Message-ID: Date: Wed, 15 Feb 2017 16:24:18 -0500 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <20170215200259.GA1028@altlinux.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="HM93jlWsOa2EjJFO2RlP6Aq5T9j5n5wxp" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --HM93jlWsOa2EjJFO2RlP6Aq5T9j5n5wxp Content-Type: multipart/mixed; boundary="Qun3mGEv5cltqBA1aDjpXF5tFrTPN7kjL"; protected-headers="v1" From: Jeff Mahoney To: "Dmitry V. Levin" , David Sterba , Josef Bacik , Liu Bo , Anand Jain Cc: linux-kernel@vger.kernel.org Message-ID: Subject: Re: [PATCH] uapi: fix linux/btrfs.h userspace compilation error References: <20170215200259.GA1028@altlinux.org> In-Reply-To: <20170215200259.GA1028@altlinux.org> --Qun3mGEv5cltqBA1aDjpXF5tFrTPN7kjL Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 2/15/17 3:02 PM, Dmitry V. Levin wrote: > Stop using NULL to fix the following linux/btrfs.h userspace compilatio= n > error: >=20 > /usr/include/linux/btrfs.h: In function 'btrfs_err_str': > /usr/include/linux/btrfs.h:740:11: error: 'NULL' undeclared (first use = in this function) > return NULL; >=20 > Signed-off-by: Dmitry V. Levin > --- > include/uapi/linux/btrfs.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h > index db4c253..01c612f 100644 > --- a/include/uapi/linux/btrfs.h > +++ b/include/uapi/linux/btrfs.h > @@ -737,7 +737,7 @@ static inline char *btrfs_err_str(enum btrfs_err_co= de err_code) > return "add/delete/balance/replace/resize operation "\ > "in progress"; > default: > - return NULL; > + return 0; > } > } > =20 >=20 Hi Dmitry - Just remove the whole routine. It's not called from anywhere and is replicated in the userspace headers for btrfsprogs. -Jeff --=20 Jeff Mahoney SUSE Labs --Qun3mGEv5cltqBA1aDjpXF5tFrTPN7kjL-- --HM93jlWsOa2EjJFO2RlP6Aq5T9j5n5wxp Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2 iQIVAwUBWKTHBh57S2MheeWyAQilphAAxNc83hMMAuy+vdYWGwmw4yN+d+6xpPGz 9jShxT5YPs67QdoaIVm2ArI73/MckV5xV5Z9b975x5/aHWKpvyIB54GyNJGsCqei 6H02lHGupnJH/D2BuQhUYXoH2XqA4HbkWFcIFMgrQt4e+b3B3TsnFY1U7JZs23Mm Jqh+u60kGDwzobdw3wqgxEj6fKcxLUy5Kb3+8OXWMORPNXzKVURGQGAB0OJDzcxa VG4K45ubQyCQy51SYEMY5RGlteF6FI7oajFLlSWvcvJvb6b4SoVXNZwuuHB/7IwU zZnkghTj9oCeZx3alqIhBKpyLvkxAjD+fbgMDfGYU8iMkjlPfM0FC8H4/q+h+BgE k0tLgGftu93HXuVVGgZYy+6vcui/gelliZnXuQR5DhbIaaxSBnefqcaQD/qR9i9L roc5QwA1nfIu9qSWhOjTJ+v5krHl3vYOahrwOYmepGTWVU5Jd7OC8wsUoj4CZVT8 NsfSnHNQHI+JL2g9vfnAChxtybKr9btuPE6Ol7aLv+k6urKq2gy6WavGMERnJVYh mibzYscy/Oe9Yw3esGNWY7CMe36LNs/WA3bv98mb78RGjQj6yZer4ckbG0tCJVXe OpTeANf2V0YJBcDwki6lw9rFOdzS3Ag96sgqMH0a7hZz5xMlZezhhUFIHfPrneU5 lYijUhBKT2s= =KbMX -----END PGP SIGNATURE----- --HM93jlWsOa2EjJFO2RlP6Aq5T9j5n5wxp--