ceph: fix bookkeeper kcalloc macro

diff --git a/fs/ceph/bookkeeper.c b/fs/ceph/bookkeeper.c
index af03a0947281155ba10990bd6804b88b4b75a1f1..5d244edf3118aa8350a5a091698fff055e739e31 100644 (file)
--- a/fs/ceph/bookkeeper.c
+++ b/fs/ceph/bookkeeper.c
@@ -22,8 +22,8 @@ static size_t _total_free;
 
 struct alloc_data {
        u32 prefix_magic;
-       struct list_head node;
        size_t size;
+       struct list_head node;
        char *fname;
        int line;
        u32 suffix_magic;

diff --git a/fs/ceph/bookkeeper.h b/fs/ceph/bookkeeper.h
index 598ae8d1ce1a2d0bcdea8fb14f1f48ea6c25db05..b9b437c125c3b36869638f98f3a98f72f2dc15f3 100644 (file)
--- a/fs/ceph/bookkeeper.h
+++ b/fs/ceph/bookkeeper.h
@@ -23,7 +23,7 @@ extern void ceph_kfree(const void *ptr);
 #define kmalloc(size, flags)   ceph_kmalloc(__FILE__, __LINE__, size, flags)
 #define kzalloc(size, flags)   ceph_kmalloc(__FILE__, __LINE__, size, \
                                             flags | __GFP_ZERO)
-#define kcalloc(n, size, flags)        ceph_kmalloc(__FILE__, __LINE__, n * size, \
+#define kcalloc(n, size, flags)        ceph_kmalloc(__FILE__, __LINE__, (n) * (size), \
                                             flags | __GFP_ZERO)
 #define kstrdup(src, flags)    ceph_kstrdup(__FILE__, __LINE__, \
                                                      src, flags)