Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
This commit is contained in:
commit
2ba1bc06fc
|
@ -1,9 +1,6 @@
|
||||||
# Default build options
|
|
||||||
AM_CFLAGS = -ggdb -O2 -std=c99
|
|
||||||
AM_CFLAGS += -Wall -Wstrict-prototypes -Wshadow -Werror
|
|
||||||
|
|
||||||
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
|
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
|
||||||
# FIXME: consider removing this as soon as we reasonably can.
|
# FIXME: consider removing this as soon as we reasonably can.
|
||||||
|
AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror
|
||||||
AM_CFLAGS += -Wno-switch -Wno-unused -Wno-missing-braces
|
AM_CFLAGS += -Wno-switch -Wno-unused -Wno-missing-braces
|
||||||
AM_CFLAGS += -Wno-unknown-pragmas -Wno-parentheses
|
AM_CFLAGS += -Wno-unknown-pragmas -Wno-parentheses
|
||||||
AM_CFLAGS += -Wno-uninitialized -fno-strict-aliasing
|
AM_CFLAGS += -Wno-uninitialized -fno-strict-aliasing
|
||||||
|
|
|
@ -226,16 +226,16 @@ list_link_replace(list_node_t *lold, list_node_t *lnew)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
list_link_init(list_node_t *link)
|
list_link_init(list_node_t *ln)
|
||||||
{
|
{
|
||||||
link->list_next = NULL;
|
ln->list_next = NULL;
|
||||||
link->list_prev = NULL;
|
ln->list_prev = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
list_link_active(list_node_t *link)
|
list_link_active(list_node_t *ln)
|
||||||
{
|
{
|
||||||
return (link->list_next != NULL);
|
return (ln->list_next != NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
|
Loading…
Reference in New Issue