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

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

[Dmitry V. Levin]

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;
 	}
 }
 
-- 
ldv

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

[Joe Perches]

On Wed, 2017-02-15 at 23:02 +0300, 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
[]
> @@ -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;

Perhaps to avoid some other warnings this might be better

	return (void *)0;

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

[Jeff Mahoney]

[-- Attachment #1.1: Type: text/plain, Size: 1068 bytes --]

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


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH v2] btrfs: remove btrfs_err_str function from uapi/linux/btrfs.h

[Dmitry V. Levin]

btrfs_err_str function is not called from anywhere and is replicated
in the userspace headers for btrfs-progs.

It's removal also fixes 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;

Suggested-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
---
v2: remove btrfs_err_str rather than fix it

 include/uapi/linux/btrfs.h | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h
index db4c253..dcfc3a5 100644
--- a/include/uapi/linux/btrfs.h
+++ b/include/uapi/linux/btrfs.h
@@ -713,33 +713,6 @@ enum btrfs_err_code {
 	BTRFS_ERROR_DEV_ONLY_WRITABLE,
 	BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS
 };
-/* An error code to error string mapping for the kernel
-*  error codes
-*/
-static inline char *btrfs_err_str(enum btrfs_err_code err_code)
-{
-	switch (err_code) {
-		case BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET:
-			return "unable to go below two devices on raid1";
-		case BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET:
-			return "unable to go below four devices on raid10";
-		case BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET:
-			return "unable to go below two devices on raid5";
-		case BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET:
-			return "unable to go below three devices on raid6";
-		case BTRFS_ERROR_DEV_TGT_REPLACE:
-			return "unable to remove the dev_replace target dev";
-		case BTRFS_ERROR_DEV_MISSING_NOT_FOUND:
-			return "no missing devices found to remove";
-		case BTRFS_ERROR_DEV_ONLY_WRITABLE:
-			return "unable to remove the only writeable device";
-		case BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS:
-			return "add/delete/balance/replace/resize operation "\
-				"in progress";
-		default:
-			return NULL;
-	}
-}
 
 #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \
 				   struct btrfs_ioctl_vol_args)
-- 
ldv

Re: [PATCH v2] btrfs: remove btrfs_err_str function from uapi/linux/btrfs.h

[David Sterba]

On Thu, Feb 16, 2017 at 01:55:03AM +0300, Dmitry V. Levin wrote:
> btrfs_err_str function is not called from anywhere and is replicated
> in the userspace headers for btrfs-progs.
> 
> It's removal also fixes 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;
> 
> Suggested-by: Jeff Mahoney <jeffm@suse.com>
> Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>

Reviewed-by: David Sterba <dsterba@suse.com>

[PATCH v3] btrfs: remove btrfs_err_str function from uapi/linux/btrfs.h

[Dmitry V. Levin]

btrfs_err_str function is not called from anywhere and is replicated
in the userspace headers for btrfs-progs.

It's removal also fixes 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;

Suggested-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Reviewed-by: David Sterba <dsterba@suse.com>
---
v3: the patch seems to be lost, resending with updated list of addressees

v2: remove btrfs_err_str rather than fix it

 include/uapi/linux/btrfs.h | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h
index db4c253..dcfc3a5 100644
--- a/include/uapi/linux/btrfs.h
+++ b/include/uapi/linux/btrfs.h
@@ -713,33 +713,6 @@ enum btrfs_err_code {
 	BTRFS_ERROR_DEV_ONLY_WRITABLE,
 	BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS
 };
-/* An error code to error string mapping for the kernel
-*  error codes
-*/
-static inline char *btrfs_err_str(enum btrfs_err_code err_code)
-{
-	switch (err_code) {
-		case BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET:
-			return "unable to go below two devices on raid1";
-		case BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET:
-			return "unable to go below four devices on raid10";
-		case BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET:
-			return "unable to go below two devices on raid5";
-		case BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET:
-			return "unable to go below three devices on raid6";
-		case BTRFS_ERROR_DEV_TGT_REPLACE:
-			return "unable to remove the dev_replace target dev";
-		case BTRFS_ERROR_DEV_MISSING_NOT_FOUND:
-			return "no missing devices found to remove";
-		case BTRFS_ERROR_DEV_ONLY_WRITABLE:
-			return "unable to remove the only writeable device";
-		case BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS:
-			return "add/delete/balance/replace/resize operation "\
-				"in progress";
-		default:
-			return NULL;
-	}
-}
 
 #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \
 				   struct btrfs_ioctl_vol_args)
-- 
ldv

Re: [PATCH v3] btrfs: remove btrfs_err_str function from uapi/linux/btrfs.h

[David Sterba]

On Wed, Mar 01, 2017 at 02:12:50AM +0300, Dmitry V. Levin wrote:
> btrfs_err_str function is not called from anywhere and is replicated
> in the userspace headers for btrfs-progs.
> 
> It's removal also fixes 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;
> 
> Suggested-by: Jeff Mahoney <jeffm@suse.com>
> Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
> Reviewed-by: David Sterba <dsterba@suse.com>
> ---
> v3: the patch seems to be lost, resending with updated list of addressees

Indeed, I can't find how or where it got lost, sorry. Added to 4.11
again.

Re: [PATCH v3] btrfs: remove btrfs_err_str function from uapi/linux/btrfs.h

[David Sterba]

On Wed, Mar 01, 2017 at 03:54:35PM +0100, David Sterba wrote:
> On Wed, Mar 01, 2017 at 02:12:50AM +0300, Dmitry V. Levin wrote:
> > btrfs_err_str function is not called from anywhere and is replicated
> > in the userspace headers for btrfs-progs.
> > 
> > It's removal also fixes 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;
> > 
> > Suggested-by: Jeff Mahoney <jeffm@suse.com>
> > Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
> > Reviewed-by: David Sterba <dsterba@suse.com>
> > ---
> > v3: the patch seems to be lost, resending with updated list of addressees
> 
> Indeed, I can't find how or where it got lost, sorry. Added to 4.11
> again.

So it's because you did not CC linux-btrfs@ , I have the mails in my
inbox but haven't found it in the other folder while picking patches.

Re: [PATCH v3] btrfs: remove btrfs_err_str function from uapi/linux/btrfs.h

[Dmitry V. Levin]

On Thu, Mar 02, 2017 at 12:42:12PM +0100, David Sterba wrote:
> On Wed, Mar 01, 2017 at 03:54:35PM +0100, David Sterba wrote:
> > On Wed, Mar 01, 2017 at 02:12:50AM +0300, Dmitry V. Levin wrote:
> > > btrfs_err_str function is not called from anywhere and is replicated
> > > in the userspace headers for btrfs-progs.
> > > 
> > > It's removal also fixes 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;
> > > 
> > > Suggested-by: Jeff Mahoney <jeffm@suse.com>
> > > Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
> > > Reviewed-by: David Sterba <dsterba@suse.com>
> > > ---
> > > v3: the patch seems to be lost, resending with updated list of addressees
> > 
> > Indeed, I can't find how or where it got lost, sorry. Added to 4.11
> > again.
> 
> So it's because you did not CC linux-btrfs@ , I have the mails in my
> inbox but haven't found it in the other folder while picking patches.

Thanks, I though so when Cc'ed linux-btrfs@ the last time.

Consider updating MAINTAINERS file so that scripts/get_maintainer.pl
would be able to print the right addressees for btrfs header files:

diff --git a/MAINTAINERS b/MAINTAINERS
index 0001835..04a758f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2905,4 +2905,6 @@ S:	Maintained
 F:	Documentation/filesystems/btrfs.txt
 F:	fs/btrfs/
+F:	include/linux/btrfs*
+F:	include/uapi/linux/btrfs*
 
 BTTV VIDEO4LINUX DRIVER

-- 
ldv

Re: [PATCH v3] btrfs: remove btrfs_err_str function from uapi/linux/btrfs.h

[David Sterba]

On Thu, Mar 02, 2017 at 04:01:17PM +0300, Dmitry V. Levin wrote:
> On Thu, Mar 02, 2017 at 12:42:12PM +0100, David Sterba wrote:
> > On Wed, Mar 01, 2017 at 03:54:35PM +0100, David Sterba wrote:
> > > On Wed, Mar 01, 2017 at 02:12:50AM +0300, Dmitry V. Levin wrote:
> > > > btrfs_err_str function is not called from anywhere and is replicated
> > > > in the userspace headers for btrfs-progs.
> > > > 
> > > > It's removal also fixes 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;
> > > > 
> > > > Suggested-by: Jeff Mahoney <jeffm@suse.com>
> > > > Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
> > > > Reviewed-by: David Sterba <dsterba@suse.com>
> > > > ---
> > > > v3: the patch seems to be lost, resending with updated list of addressees
> > > 
> > > Indeed, I can't find how or where it got lost, sorry. Added to 4.11
> > > again.
> > 
> > So it's because you did not CC linux-btrfs@ , I have the mails in my
> > inbox but haven't found it in the other folder while picking patches.
> 
> Thanks, I though so when Cc'ed linux-btrfs@ the last time.
> 
> Consider updating MAINTAINERS file so that scripts/get_maintainer.pl
> would be able to print the right addressees for btrfs header files:

Good idea.

> diff --git a/MAINTAINERS b/MAINTAINERS
> index 0001835..04a758f 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2905,4 +2905,6 @@ S:	Maintained
>  F:	Documentation/filesystems/btrfs.txt
>  F:	fs/btrfs/
> +F:	include/linux/btrfs*
> +F:	include/uapi/linux/btrfs*
>  
>  BTTV VIDEO4LINUX DRIVER

Please send a proper patch and add

Acked-by: David Sterba <dsterba@suse.com>

[PATCH] MAINTAINERS: add btrfs file entries

[Dmitry V. Levin]

Add file entries for btrfs header files.

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Acked-by: David Sterba <dsterba@suse.com>
---
 MAINTAINERS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 0001835..04a758f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2904,6 +2904,8 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git
 S:	Maintained
 F:	Documentation/filesystems/btrfs.txt
 F:	fs/btrfs/
+F:	include/linux/btrfs*
+F:	include/uapi/linux/btrfs*
 
 BTTV VIDEO4LINUX DRIVER
 M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>
-- 
ldv