gcc: replace #ifdef linux with __linux__

diff --git a/WHATS_NEW b/WHATS_NEW
index af1a26a5c24de1fa154fac8be6a84a568ea6a275..ff6041d49d454c783db91edccd05463cabb81c72 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -18,6 +18,7 @@ Version 2.02.104 -
   Remove 2>/dev/null from three lvm commands executed by vgimportclone.
   Add configure --enable-udev-systemd-background-jobs.
   Add lvm2-pvscan@.service to run pvscan as a service for lvmetad/autoactivation.
+  Use #ifdef __linux__ instead of linux throughout.
   Fix lvconvert swap of poolmetadata volume for active thin pool.
   Check for open count with a timeout before removal/deactivation of an LV.
   Report RAID images split with tracking as out-of-sync ("I").

diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c
index 3754714455fb29dada78ca1ad59fcaf76301ec45..bdaf552f8be542607d9013c8b0a2e4c2350bfbf2 100644 (file)
--- a/daemons/dmeventd/dmeventd.c
+++ b/daemons/dmeventd/dmeventd.c
@@ -39,7 +39,7 @@
 #include <arpa/inet.h>         /* for htonl, ntohl */
 #include <fcntl.h>             /* for musl libc */
 
-#ifdef linux
+#ifdef __linux__
 /*
  * Kernel version 2.6.36 and higher has
  * new OOM killer adjustment interface.
@@ -1619,7 +1619,7 @@ static void _exit_handler(int sig __attribute__((unused)))
        _exit_now = 1;
 }
 
-#ifdef linux
+#ifdef __linux__
 static int _set_oom_adj(const char *oom_adj_path, int val)
 {
        FILE *fp;
@@ -1810,7 +1810,7 @@ static void _daemonize(void)
                fd = rlim.rlim_cur;
 
        for (--fd; fd >= 0; fd--) {
-#ifdef linux
+#ifdef __linux__
                /* Do not close fds preloaded by systemd! */
                if (_systemd_activation &&
                    (fd == SD_FD_FIFO_SERVER || fd == SD_FD_FIFO_CLIENT))
@@ -1963,7 +1963,7 @@ int main(int argc, char *argv[])
        if (_restart)
                restart();
 
-#ifdef linux
+#ifdef __linux__
        _systemd_activation = _systemd_handover(&fifos);
 #endif
 
@@ -1985,7 +1985,7 @@ int main(int argc, char *argv[])
        signal(SIGHUP, &_exit_handler);
        signal(SIGQUIT, &_exit_handler);
 
-#ifdef linux
+#ifdef __linux__
        /* Systemd has adjusted oom killer for us already */
        if (!_systemd_activation && !_protect_against_oom_killer())
                syslog(LOG_ERR, "Failed to protect against OOM killer");

diff --git a/daemons/dmeventd/plugins/thin/dmeventd_thin.c b/daemons/dmeventd/plugins/thin/dmeventd_thin.c
index 8b173f1eb023e7b51ca719ea1e9de66bea70d851..3126bfa02f8ca20cea8a852297aa82d7b0264898 100644 (file)
--- a/daemons/dmeventd/plugins/thin/dmeventd_thin.c
+++ b/daemons/dmeventd/plugins/thin/dmeventd_thin.c
@@ -44,7 +44,7 @@ struct dso_state {
 
 
 /* TODO - move this mountinfo code into library to be reusable */
-#ifdef linux
+#ifdef __linux__
 #  include "kdev_t.h"
 #else
 #  define MAJOR(x) major((x))

diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index 7e6a5aca7605de10243e3a880408e9c23fba0d7f..059740997bedecae6e139715a82f6f20d8c9e3f9 100644 (file)
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -910,8 +910,8 @@ int lv_raid_message(const struct logical_volume *lv, const char *msg)
                if (lv_is_thin_pool(lv) &&
                    (lv_is_raid(seg_lv(first_seg(lv), 0)) ||
                     lv_is_raid(first_seg(lv)->metadata_lv))) {
-                       log_error("Thinpool data or metadata volume"
-                                 " must be specified. (e.g. \"%s/%s_tdata\")",
+                       log_error("Thin pool data or metadata volume "
+                                 "must be specified. (E.g. \"%s/%s_tdata\")",
                                  lv->vg->name, lv->name);
                        return 0;
                }

diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c
index 3ed359d3a773948062c9aaa6cf95eb773ace2ec3..d13d8d52026c6f84393de094494a728ee29a2679 100644 (file)
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -49,7 +49,7 @@
 #include <syslog.h>
 #include <time.h>
 
-#ifdef linux
+#ifdef __linux__
 #  include <malloc.h>
 #endif
 

diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c
index 34e3064174b374d8c7d1eed2039386e9bc803129..6c8613c8416dc33392dcd747e86ab717bef17b88 100644 (file)
--- a/lib/device/dev-io.c
+++ b/lib/device/dev-io.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 
-#ifdef linux
+#ifdef __linux__
 #  define u64 uint64_t         /* Missing without __KERNEL__ */
 #  undef WNOHANG               /* Avoid redefinition */
 #  undef WUNTRACED             /* Avoid redefinition */

diff --git a/lib/device/dev-md.c b/lib/device/dev-md.c
index a8bbe818498444e3369d9f280296ef82e49f4312..9af8074fe3d21566ee07b426528d8d3fd33d28e4 100644 (file)
--- a/lib/device/dev-md.c
+++ b/lib/device/dev-md.c
@@ -18,7 +18,7 @@
 #include "metadata.h"
 #include "xlate.h"
 
-#ifdef linux
+#ifdef __linux__
 
 /* Lifted from <linux/raid/md_p.h> because of difficulty including it */
 

diff --git a/lib/device/dev-swap.c b/lib/device/dev-swap.c
index 6faa810325ce5ee3e43b67ece08ca58c62e933da..cc44008f8f7f34236e783e4d291108b80f6208e5 100644 (file)
--- a/lib/device/dev-swap.c
+++ b/lib/device/dev-swap.c
@@ -15,7 +15,7 @@
 #include "lib.h"
 #include "dev-type.h"
 
-#ifdef linux
+#ifdef __linux__
 
 #define MAX_PAGESIZE   (64 * 1024)
 #define SIGNATURE_SIZE  10

diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c
index 11f040768ca08f918bd0301a5de02d6ee2cfc8cd..a98cf45c5ac60e6fc7f88f41748c0e05c68d5d0d 100644 (file)
--- a/lib/device/dev-type.c
+++ b/lib/device/dev-type.c
@@ -443,7 +443,7 @@ out:
        return ret;
 }
 
-#ifdef linux
+#ifdef __linux__
 
 static unsigned long _dev_topology_attribute(struct dev_types *dt,
                                             const char *attribute,

diff --git a/lib/device/dev-type.h b/lib/device/dev-type.h
index 1227ab0cd22b307c049df3d4f82bfd73534b7fda..2fa32dbf8487fc21a6c55ae88a26a61e337bd17b 100644 (file)
--- a/lib/device/dev-type.h
+++ b/lib/device/dev-type.h
@@ -19,7 +19,7 @@
 
 #define NUMBER_OF_MAJORS 4096
 
-#ifdef linux
+#ifdef __linux__
 #  define MAJOR(dev)   ((dev & 0xfff00) >> 8)
 #  define MINOR(dev)   ((dev & 0xff) | ((dev >> 12) & 0xfff00))
 #  define MKDEV(ma,mi) ((mi & 0xff) | (ma << 8) | ((mi & ~0xff) << 12))

diff --git a/lib/filters/filter-md.c b/lib/filters/filter-md.c
index 0089f936358330ff13fbfce314829bb1c2392c97..fe79f3da5d0eaef1b4045dd94a73ab2acc73045c 100644 (file)
--- a/lib/filters/filter-md.c
+++ b/lib/filters/filter-md.c
@@ -16,7 +16,7 @@
 #include "lib.h"
 #include "filter.h"
 
-#ifdef linux
+#ifdef __linux__
 
 static int _ignore_md(struct dev_filter *f __attribute__((unused)),
                      struct device *dev)

diff --git a/lib/filters/filter-mpath.c b/lib/filters/filter-mpath.c
index a9881fde5a4afff6b04fb8ca7c99d5d0b260e887..10106f0ff9f54af60fa91dc0cb2e3f63ed7185f0 100644 (file)
--- a/lib/filters/filter-mpath.c
+++ b/lib/filters/filter-mpath.c
@@ -16,7 +16,7 @@
 #include "filter.h"
 #include "activate.h"
 
-#ifdef linux
+#ifdef __linux__
 
 #include <dirent.h>
 

diff --git a/lib/filters/filter-sysfs.c b/lib/filters/filter-sysfs.c
index e03becae7c122ca10d87f97bc7909e774a6f74fb..af3ed078daf363b16314323feda3e00af6d86ec0 100644 (file)
--- a/lib/filters/filter-sysfs.c
+++ b/lib/filters/filter-sysfs.c
@@ -15,7 +15,7 @@
 #include "lib.h"
 #include "filter.h"
 
-#ifdef linux
+#ifdef __linux__
 
 #include <dirent.h>
 

diff --git a/lib/mm/xlate.h b/lib/mm/xlate.h
index 57d7241a274ba774903601d907e3951b073532a9..0d243c4c1d11aae79f16958fdfaa40bda8e11e48 100644 (file)
--- a/lib/mm/xlate.h
+++ b/lib/mm/xlate.h
@@ -16,7 +16,7 @@
 #ifndef _LVM_XLATE_H
 #define _LVM_XLATE_H
 
-#ifdef linux
+#ifdef __linux__
 #  include <endian.h>
 #  include <byteswap.h>
 #else

diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c
index b114b9f307d74a78097b4095771fe96e4072897b..156925a1bc37db0b0b7d25bc6cea64029680d816 100644 (file)
--- a/libdaemon/server/daemon-server.c
+++ b/libdaemon/server/daemon-server.c
@@ -54,7 +54,7 @@ static void _exit_handler(int sig __attribute__((unused)))
 
 #define EXIT_ALREADYRUNNING 13
 
-#ifdef linux
+#ifdef __linux__
 
 #include <stddef.h>
 
@@ -318,7 +318,7 @@ static void _daemonise(daemon_state s)
                fd = rlim.rlim_cur;
 
        for (--fd; fd >= 0; fd--) {
-#ifdef linux
+#ifdef __linux__
                /* Do not close fds preloaded by systemd! */
                if (_systemd_activation && fd == SD_FD_SOCKET_SERVER)
                        continue;
@@ -469,7 +469,7 @@ void daemon_start(daemon_state s)
        if (setenv("LC_ALL", "C", 1))
                perror("Cannot set LC_ALL to C");
 
-#ifdef linux
+#ifdef __linux__
        _systemd_activation = _systemd_handover(&s);
 #endif
 
@@ -504,7 +504,7 @@ void daemon_start(daemon_state s)
        signal(SIGALRM, &_exit_handler);
        signal(SIGPIPE, SIG_IGN);
 
-#ifdef linux
+#ifdef __linux__
        /* Systemd has adjusted oom killer for us already */
        if (s.avoid_oom && !_systemd_activation && !_protect_against_oom_killer())
                ERROR(&s, "Failed to protect against OOM killer");

diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c
index c530bb79a18e09768b770623defb91474fed3205..7b1fead8a520561ca2d32d69b3c274cd6c82009c 100644 (file)
--- a/libdm/ioctl/libdm-iface.c
+++ b/libdm/ioctl/libdm-iface.c
@@ -23,7 +23,7 @@
 #include <sys/utsname.h>
 #include <limits.h>
 
-#ifdef linux
+#ifdef __linux__
 #  include "kdev_t.h"
 #  include <linux/limits.h>
 #else

diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c
index 9a52f2ebfb1ad283caede67ad0f931224be3199d..febcd0e4bd80df5587faacb9871693b26a7c967a 100644 (file)
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
@@ -32,7 +32,7 @@
 #  include <libudev.h>
 #endif
 
-#ifdef linux
+#ifdef __linux__
 #  include <linux/fs.h>
 #endif
 
@@ -1069,7 +1069,7 @@ static int _rename_dev_node(const char *old_name, const char *new_name,
        return 1;
 }
 
-#ifdef linux
+#ifdef __linux__
 static int _open_dev_node(const char *dev_name)
 {
        int fd = -1;

diff --git a/libdm/misc/dm-ioctl.h b/libdm/misc/dm-ioctl.h
index dae2bcbdde10e5d8c5289e2ed510d16dd21ea8e6..76316b05b95cce4bce7952eaf61369ed77b00040 100644 (file)
--- a/libdm/misc/dm-ioctl.h
+++ b/libdm/misc/dm-ioctl.h
@@ -8,7 +8,7 @@
 #ifndef _LINUX_DM_IOCTL_V4_H
 #define _LINUX_DM_IOCTL_V4_H
 
-#ifdef linux
+#ifdef __linux__
 #  include <linux/types.h>
 #endif
 

diff --git a/tools/dmsetup.c b/tools/dmsetup.c
index e25d109a1c4ca1c4ca4c5cb746eab6afcf2cfa0c..4433571ec1bf12c67a254e544f6ce87317508ee8 100644 (file)
--- a/tools/dmsetup.c
+++ b/tools/dmsetup.c
@@ -84,7 +84,7 @@ extern char *optarg;
        __result; }))
 #endif
 
-#ifdef linux
+#ifdef __linux__
 #  include "kdev_t.h"
 #else
 #  define MAJOR(x) major((x))