client: fix ipquad macro

diff --git a/src/kernel/inode.c b/src/kernel/inode.c
index 3c9511e16b70ffc22f9227c8c373757f9922afe3..4486c54eb8b1c08417105e4b6e61b1fdd8d2f187 100644 (file)
--- a/src/kernel/inode.c
+++ b/src/kernel/inode.c
@@ -142,7 +142,6 @@ int ceph_fill_inode(struct inode *inode, struct ceph_mds_reply_inode *info)
        }
 
        ci->time = jiffies;
-
        return 0;
 }
 

diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c
index daf12267cc04ed01fdfd94b15e8eeeacaad1aa1d..ddf5807a993720a2c4c3eadf062d6a2fabad5e32 100644 (file)
--- a/src/kernel/messenger.c
+++ b/src/kernel/messenger.c
@@ -25,13 +25,6 @@ static void try_write(struct work_struct *);
 static void try_accept(struct work_struct *);
 
 
-#define IPQUADPORT(n)                                                  \
-       (unsigned int)((n.sin_addr.s_addr)>>24)&0xFF,                   \
-               (unsigned int)((n.sin_addr.s_addr)>>16)&0xFF,           \
-               (unsigned int)((n.sin_addr.s_addr)>>8)&0xFF,            \
-               (unsigned int)((n.sin_addr.s_addr)&0xFF),               \
-               (unsigned int)(ntohs(n.sin_port))
-
 
 /*
  * connections

diff --git a/src/kernel/super.h b/src/kernel/super.h
index d1055c4c14d974dd3b718df9bab731d434fe533d..045f30632d4bb17427a4b98d742f316018fd1d04 100644 (file)
--- a/src/kernel/super.h
+++ b/src/kernel/super.h
@@ -38,10 +38,10 @@ extern int ceph_lookup_cache;
 #define CACHE_HZ               (1*HZ)
 
 #define IPQUADPORT(n)                                                  \
-       (unsigned int)((n.sin_addr.s_addr)>>24)&0xFF,                   \
-               (unsigned int)((n.sin_addr.s_addr)>>16)&0xFF,           \
-               (unsigned int)((n.sin_addr.s_addr)>>8)&0xFF,            \
-               (unsigned int)((n.sin_addr.s_addr)&0xFF),               \
+       (unsigned int)((n.sin_addr.s_addr)) & 0xFF,                     \
+               (unsigned int)((n.sin_addr.s_addr)>>8) & 0xFF,          \
+               (unsigned int)((n.sin_addr.s_addr)>>16) & 0xFF,         \
+               (unsigned int)((n.sin_addr.s_addr)>>24) & 0xFF,         \
                (unsigned int)(ntohs(n.sin_port))
 
 /*