diff options
| author | Alasdair Kergon <agk@redhat.com> | 2010-01-18 20:08:44 +0000 |
|---|---|---|
| committer | Alasdair Kergon <agk@redhat.com> | 2010-01-18 20:08:44 +0000 |
| commit | 3c4310d6ef6eda0ee8395116daa4fa26c3d5512d (patch) | |
| tree | c8129c7a5b8397b08ac2818c3625a16cded734e8 /daemons/cmirrord/local.c | |
| parent | 6c1c02dc52498390c4676b35dfe30113e3fd2927 (diff) | |
| download | lvm2-3c4310d6ef6eda0ee8395116daa4fa26c3d5512d.tar.gz lvm2-3c4310d6ef6eda0ee8395116daa4fa26c3d5512d.tar.xz lvm2-3c4310d6ef6eda0ee8395116daa4fa26c3d5512d.zip | |
Misc compilation clean-ups.
Diffstat (limited to 'daemons/cmirrord/local.c')
| -rw-r--r-- | daemons/cmirrord/local.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/daemons/cmirrord/local.c b/daemons/cmirrord/local.c index e835fa0f..6e17697a 100644 --- a/daemons/cmirrord/local.c +++ b/daemons/cmirrord/local.c @@ -28,7 +28,7 @@ #include "local.h" #ifndef CN_IDX_DM -#warning Kernel should be at least 2.6.31 +/* Kernel 2.6.31 is required to run this code */ #define CN_IDX_DM 0x7 /* Device Mapper */ #define CN_VAL_DM_USERSPACE_LOG 0x1 #endif @@ -159,12 +159,12 @@ static int kernel_recv(struct clog_request **rq) * once... perhaps at compile time? */ // *rq = container_of(u_rq, struct clog_request, u_rq); - *rq = (void *)u_rq - + *rq = (char *)u_rq - (sizeof(struct clog_request) - sizeof(struct dm_ulog_request)); /* Clear the wrapper container fields */ - memset(*rq, 0, (void *)u_rq - (void *)(*rq)); + memset(*rq, 0, (char *)u_rq - (char *)(*rq)); break; default: LOG_ERROR("Unknown nlmsg_type"); @@ -218,7 +218,7 @@ static int kernel_send_helper(void *data, int out_size) * * Returns: 0 on success, -EXXX on failure */ -static int do_local_work(void *data) +static int do_local_work(void *data __attribute((unused))) { int r; struct clog_request *rq; |