Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1581680

Re: [PATCH] uapi: fix linux/btrfs.h userspace compilation error

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

On 2/15/17 3:02 PM, Dmitry V. Levin wrote:
> Stop using NULL to fix the following linux/btrfs.h userspace compilation
> error:
> 
> /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;
> 
> Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
> ---
>  include/uapi/linux/btrfs.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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_code err_code)
>  			return "add/delete/balance/replace/resize operation "\
>  				"in progress";
>  		default:
> -			return NULL;
> +			return 0;
>  	}
>  }
>  
> 

Hi Dmitry -

Just remove the whole routine.  It's not called from anywhere and is
replicated in the userspace headers for btrfsprogs.

-Jeff

-- 
Jeff Mahoney
SUSE Labs

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] uapi: fix linux/btrfs.h userspace compilation error "Dmitry V. Levin" <ldv@altlinux.org> - 2017-02-15 21:10 +0100
  Re: [PATCH] uapi: fix linux/btrfs.h userspace compilation error Joe Perches <joe@perches.com> - 2017-02-15 21:40 +0100
  Re: [PATCH] uapi: fix linux/btrfs.h userspace compilation error Jeff Mahoney <jeffm@suse.com> - 2017-02-15 22:30 +0100
    [PATCH v2] btrfs: remove btrfs_err_str function from uapi/linux/btrfs.h "Dmitry V. Levin" <ldv@altlinux.org> - 2017-02-16 00:00 +0100
      Re: [PATCH v2] btrfs: remove btrfs_err_str function from  uapi/linux/btrfs.h David Sterba <dsterba@suse.cz> - 2017-02-16 15:20 +0100
      [PATCH v3] btrfs: remove btrfs_err_str function from uapi/linux/btrfs.h "Dmitry V. Levin" <ldv@altlinux.org> - 2017-03-01 00:20 +0100

csiph-web