shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

gcc: replace #ifdef linux with __linux__

Browse Source
This commit is contained in:
Alasdair G Kergon 2013-11-13 13:56:29 +00:00
parent d8085edf65
commit 527db4645f
19 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -18,6 +18,7 @@ Version 2.02.104 -
Remove 2>/dev/null from three lvm commands executed by vgimportclone. Remove 2>/dev/null from three lvm commands executed by vgimportclone.
Add configure --enable-udev-systemd-background-jobs. Add configure --enable-udev-systemd-background-jobs.
Add lvm2-pvscan@.service to run pvscan as a service for lvmetad/autoactivation. 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. Fix lvconvert swap of poolmetadata volume for active thin pool.
Check for open count with a timeout before removal/deactivation of an LV. Check for open count with a timeout before removal/deactivation of an LV.
Report RAID images split with tracking as out-of-sync ("I"). Report RAID images split with tracking as out-of-sync ("I").

10
daemons/dmeventd/dmeventd.c
View File

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

2
daemons/dmeventd/plugins/thin/dmeventd_thin.c
View File

@ -44,7 +44,7 @@ struct dso_state {
/* TODO - move this mountinfo code into library to be reusable */ /* TODO - move this mountinfo code into library to be reusable */
#ifdef linux #ifdef __linux__
# include "kdev_t.h" # include "kdev_t.h"
#else #else
# define MAJOR(x) major((x)) # define MAJOR(x) major((x))

4
lib/activate/activate.c
View File

@ -910,8 +910,8 @@ int lv_raid_message(const struct logical_volume *lv, const char *msg)
if (lv_is_thin_pool(lv) && if (lv_is_thin_pool(lv) &&
(lv_is_raid(seg_lv(first_seg(lv), 0)) || (lv_is_raid(seg_lv(first_seg(lv), 0)) ||
lv_is_raid(first_seg(lv)->metadata_lv))) { lv_is_raid(first_seg(lv)->metadata_lv))) {
log_error("Thinpool data or metadata volume" log_error("Thin pool data or metadata volume "
" must be specified. (e.g. \"%s/%s_tdata\")", "must be specified. (E.g. \"%s/%s_tdata\")",
lv->vg->name, lv->name); lv->vg->name, lv->name);
return 0; return 0;
} }

2
lib/commands/toolcontext.c
View File

@ -49,7 +49,7 @@
#include <syslog.h> #include <syslog.h>
#include <time.h> #include <time.h>
#ifdef linux #ifdef __linux__
# include <malloc.h> # include <malloc.h>
#endif #endif

2
lib/device/dev-io.c
View File

@ -27,7 +27,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#ifdef linux #ifdef __linux__
# define u64 uint64_t /* Missing without __KERNEL__ */ # define u64 uint64_t /* Missing without __KERNEL__ */
# undef WNOHANG /* Avoid redefinition */ # undef WNOHANG /* Avoid redefinition */
# undef WUNTRACED /* Avoid redefinition */ # undef WUNTRACED /* Avoid redefinition */

2
lib/device/dev-md.c
View File

@ -18,7 +18,7 @@
#include "metadata.h" #include "metadata.h"
#include "xlate.h" #include "xlate.h"
#ifdef linux #ifdef __linux__
/* Lifted from <linux/raid/md_p.h> because of difficulty including it */ /* Lifted from <linux/raid/md_p.h> because of difficulty including it */

2
lib/device/dev-swap.c
View File

@ -15,7 +15,7 @@
#include "lib.h" #include "lib.h"
#include "dev-type.h" #include "dev-type.h"
#ifdef linux #ifdef __linux__
#define MAX_PAGESIZE (64 * 1024) #define MAX_PAGESIZE (64 * 1024)
#define SIGNATURE_SIZE 10 #define SIGNATURE_SIZE 10

2
lib/device/dev-type.c
View File

@ -443,7 +443,7 @@ out:
return ret; return ret;
} }
#ifdef linux #ifdef __linux__
static unsigned long _dev_topology_attribute(struct dev_types *dt, static unsigned long _dev_topology_attribute(struct dev_types *dt,
const char *attribute, const char *attribute,

2
lib/device/dev-type.h
View File

@ -19,7 +19,7 @@
#define NUMBER_OF_MAJORS 4096 #define NUMBER_OF_MAJORS 4096
#ifdef linux #ifdef __linux__
# define MAJOR(dev) ((dev & 0xfff00) >> 8) # define MAJOR(dev) ((dev & 0xfff00) >> 8)
# define MINOR(dev) ((dev & 0xff) | ((dev >> 12) & 0xfff00)) # define MINOR(dev) ((dev & 0xff) | ((dev >> 12) & 0xfff00))
# define MKDEV(ma,mi) ((mi & 0xff) | (ma << 8) | ((mi & ~0xff) << 12)) # define MKDEV(ma,mi) ((mi & 0xff) | (ma << 8) | ((mi & ~0xff) << 12))

2
lib/filters/filter-md.c
View File

@ -16,7 +16,7 @@
#include "lib.h" #include "lib.h"
#include "filter.h" #include "filter.h"
#ifdef linux #ifdef __linux__
static int _ignore_md(struct dev_filter *f __attribute__((unused)), static int _ignore_md(struct dev_filter *f __attribute__((unused)),
struct device *dev) struct device *dev)

2
lib/filters/filter-mpath.c
View File

@ -16,7 +16,7 @@
#include "filter.h" #include "filter.h"
#include "activate.h" #include "activate.h"
#ifdef linux #ifdef __linux__
#include <dirent.h> #include <dirent.h>

2
lib/filters/filter-sysfs.c
View File

@ -15,7 +15,7 @@
#include "lib.h" #include "lib.h"
#include "filter.h" #include "filter.h"
#ifdef linux #ifdef __linux__
#include <dirent.h> #include <dirent.h>

2
lib/mm/xlate.h
View File

@ -16,7 +16,7 @@
#ifndef _LVM_XLATE_H #ifndef _LVM_XLATE_H
#define _LVM_XLATE_H #define _LVM_XLATE_H
#ifdef linux #ifdef __linux__
# include <endian.h> # include <endian.h>
# include <byteswap.h> # include <byteswap.h>
#else #else

8
libdaemon/server/daemon-server.c
View File

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

2
libdm/ioctl/libdm-iface.c
View File

@ -23,7 +23,7 @@
#include <sys/utsname.h> #include <sys/utsname.h>
#include <limits.h> #include <limits.h>
#ifdef linux #ifdef __linux__
# include "kdev_t.h" # include "kdev_t.h"
# include <linux/limits.h> # include <linux/limits.h>
#else #else

4
libdm/libdm-common.c
View File

@ -32,7 +32,7 @@
# include <libudev.h> # include <libudev.h>
#endif #endif
#ifdef linux #ifdef __linux__
# include <linux/fs.h> # include <linux/fs.h>
#endif #endif
@ -1069,7 +1069,7 @@ static int _rename_dev_node(const char *old_name, const char *new_name,
return 1; return 1;
} }
#ifdef linux #ifdef __linux__
static int _open_dev_node(const char *dev_name) static int _open_dev_node(const char *dev_name)
{ {
int fd = -1; int fd = -1;

2
libdm/misc/dm-ioctl.h
View File

@ -8,7 +8,7 @@
#ifndef _LINUX_DM_IOCTL_V4_H #ifndef _LINUX_DM_IOCTL_V4_H
#define _LINUX_DM_IOCTL_V4_H #define _LINUX_DM_IOCTL_V4_H
#ifdef linux #ifdef __linux__
# include <linux/types.h> # include <linux/types.h>
#endif #endif

2
tools/dmsetup.c
View File

@ -84,7 +84,7 @@ extern char *optarg;
__result; })) __result; }))
#endif #endif
#ifdef linux #ifdef __linux__
# include "kdev_t.h" # include "kdev_t.h"
#else #else
# define MAJOR(x) major((x)) # define MAJOR(x) major((x))