[PATCH] Add container_of and ROUND_UP macros

Needed by follow up commits. container_of is actually
just moved/consolidated to util.h.

Signed-off-by: Bernd Schubert <bschubert@ddn.com>
(cherry picked from commit c5a032b3410d7225ac0355355faa63565a209943)

Gbp-Pq: Name Add-container_of-and-ROUND_UP-macros.patch

diff --git a/lib/fuse.c b/lib/fuse.c
index c0d00edbc463e6f8c1cd872f663d6b05395ffbb8..4964de20fc2a5806744a42b641c2a7bfc2278a98 100644 (file)
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -92,10 +92,6 @@ struct node_table {
        size_t split;
 };
 
-#define container_of(ptr, type, member) ({                              \
-                       const typeof( ((type *)0)->member ) *__mptr = (ptr); \
-                       (type *)( (char *)__mptr - offsetof(type,member) );})
-
 #define list_entry(ptr, type, member)           \
        container_of(ptr, type, member)
 

diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index 9ee88b16063aa9872289a3d1003b7f1b4c310008..cb046aae02f7380d6483da4b9402be692b9f38b0 100644 (file)
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -44,10 +44,6 @@
 #define PARAM(inarg) (((char *)(inarg)) + sizeof(*(inarg)))
 #define OFFSET_MAX 0x7fffffffffffffffLL
 
-#define container_of(ptr, type, member) ({                             \
-                       const typeof( ((type *)0)->member ) *__mptr = (ptr); \
-                       (type *)( (char *)__mptr - offsetof(type,member) );})
-
 struct fuse_pollhandle {
        uint64_t kh;
        struct fuse_session *se;

diff --git a/lib/util.h b/lib/util.h
index 508fafb1298e9ad668df8bc63cf87c4b3969d3b3..ed03ad40e63792e6683c4fc2528e6cd0965c6000 100644 (file)
--- a/lib/util.h
+++ b/lib/util.h
@@ -30,4 +30,10 @@ static inline uint64_t fuse_higher_32_bits(uint64_t nr)
 #define FUSE_VAR_UNUSED(var) (__attribute__((unused)) var)
 #endif
 
+#define container_of(ptr, type, member)                      \
+       ({                                                   \
+               unsigned long __mptr = (unsigned long)(ptr); \
+               ((type *)(__mptr - offsetof(type, member))); \
+       })
+
 #endif