From: "Dmitry V. Levin" <ldv@altlinux.org>
To: Jeff Mahoney <jeffm@suse.com>
Cc: David Sterba <dsterba@suse.com>, Josef Bacik <jbacik@fb.com>,
Liu Bo <bo.li.liu@oracle.com>, Anand Jain <anand.jain@oracle.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2] btrfs: remove btrfs_err_str function from uapi/linux/btrfs.h
Date: Thu, 16 Feb 2017 01:55:03 +0300 [thread overview]
Message-ID: <20170215225503.GA2947@altlinux.org> (raw)
In-Reply-To: <e5736c5a-1cef-58cb-a171-055e139e26e7@suse.com>
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
next prev parent reply other threads:[~2017-02-15 22:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-15 20:02 [PATCH] uapi: fix linux/btrfs.h userspace compilation error Dmitry V. Levin
2017-02-15 20:36 ` Joe Perches
2017-02-15 21:24 ` Jeff Mahoney
2017-02-15 22:55 ` Dmitry V. Levin [this message]
2017-02-16 14:15 ` [PATCH v2] btrfs: remove btrfs_err_str function from uapi/linux/btrfs.h David Sterba
2017-02-28 23:12 ` [PATCH v3] " Dmitry V. Levin
2017-03-01 14:54 ` David Sterba
2017-03-02 11:42 ` David Sterba
2017-03-02 13:01 ` Dmitry V. Levin
2017-03-02 18:59 ` David Sterba
2017-03-02 19:42 ` [PATCH] MAINTAINERS: add btrfs file entries Dmitry V. Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170215225503.GA2947@altlinux.org \
--to=ldv@altlinux.org \
--cc=anand.jain@oracle.com \
--cc=bo.li.liu@oracle.com \
--cc=dsterba@suse.com \
--cc=jbacik@fb.com \
--cc=jeffm@suse.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).