Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

2008-12-05 12:47:38 -08:00 · 2008-12-05 12:47:38 -08:00 · b390e0938c
parent ee208ca1c5 51e57e41da
commit b390e0938c
1 changed files with 3 additions and 0 deletions
--- a/zfs/lib/libzpool/include/sys/dmu_impl.h
+++ b/zfs/lib/libzpool/include/sys/dmu_impl.h
@ -234,8 +234,11 @@ struct dmu_pool;

 #define DMU_CALLBACK_MAGIC 0xca11bac0ca11bacfull

+/* container_of() already defined in linux kernel */
+#ifndef container_of
 #define container_of(ptr, type, member) \
    ((type *)((char *)(ptr) - offsetof(type, member)))
+#endif

 typedef struct dmu_callback {
 	list_node_t         dcb_node;    /* linked to tx_callbacks list */