diff options
| author | Zach Brown <zab@redhat.com> | 2013-08-14 16:16:32 -0700 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2013-09-03 19:41:01 +0200 |
| commit | 7eab7f2a9cf0d261cb49fdd440828370db5af72a (patch) | |
| tree | 0555baf4ebd344b24a902338bc515826a832b3a4 | |
| parent | dfc66e3c9302470278e6a38c6a5c833153b99922 (diff) | |
btrfs-progs: remove __CHECKER__ from main code
__CHECKER__ is only for the type juggling used to tell sparse which
types need conversion between address spaces. It is not OK to use to
change the code that gets checked to avoid bugs elsewhere in the build
infrastructure. We want to check the code that builds when the checker
isn't enabled.
Signed-off-by: Zach Brown <zab@redhat.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
| -rw-r--r-- | btrfs-convert.c | 2 | ||||
| -rw-r--r-- | btrfs-list.c | 2 | ||||
| -rw-r--r-- | cmds-device.c | 9 | ||||
| -rw-r--r-- | mkfs.c | 3 | ||||
| -rw-r--r-- | utils.c | 7 |
5 files changed, 0 insertions, 23 deletions
diff --git a/btrfs-convert.c b/btrfs-convert.c index a4608ec8..9a7da57c 100644 --- a/btrfs-convert.c +++ b/btrfs-convert.c @@ -21,10 +21,8 @@ #include "kerncompat.h" -#ifndef __CHECKER__ #include <sys/ioctl.h> #include <sys/mount.h> -#endif #include <stdio.h> #include <stdlib.h> #include <sys/types.h> diff --git a/btrfs-list.c b/btrfs-list.c index 072a5927..214cb450 100644 --- a/btrfs-list.c +++ b/btrfs-list.c @@ -17,11 +17,9 @@ */ #define _GNU_SOURCE -#ifndef __CHECKER__ #include <sys/ioctl.h> #include <sys/mount.h> #include "ioctl.h" -#endif #include <stdio.h> #include <stdlib.h> #include <sys/types.h> diff --git a/cmds-device.c b/cmds-device.c index be2aaff3..48ac526c 100644 --- a/cmds-device.c +++ b/cmds-device.c @@ -30,15 +30,6 @@ #include "commands.h" -/* FIXME - imported cruft, fix sparse errors and warnings */ -#ifdef __CHECKER__ -#define BLKGETSIZE64 0 -#define BTRFS_IOC_SNAP_CREATE_V2 0 -#define BTRFS_VOL_NAME_MAX 255 -struct btrfs_ioctl_vol_args { char name[BTRFS_VOL_NAME_MAX]; }; -static inline int ioctl(int fd, int define, void *arg) { return 0; } -#endif - static const char * const device_cmd_group_usage[] = { "btrfs device <command> [<args>]", NULL @@ -21,12 +21,9 @@ #include "kerncompat.h" -#ifndef __CHECKER__ #include <sys/ioctl.h> #include <sys/mount.h> #include "ioctl.h" -#endif - #include <stdio.h> #include <stdlib.h> #include <sys/types.h> @@ -24,10 +24,8 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#ifndef __CHECKER__ #include <sys/ioctl.h> #include <sys/mount.h> -#endif #include <sys/types.h> #include <sys/stat.h> #include <uuid/uuid.h> @@ -50,11 +48,6 @@ #include "volumes.h" #include "ioctl.h" -#ifdef __CHECKER__ -#define BLKGETSIZE64 0 -static inline int ioctl(int fd, int define, u64 *size) { return 0; } -#endif - #ifndef BLKDISCARD #define BLKDISCARD _IO(0x12,119) #endif |