From 542e4d65a3037667dab9ccea9c3ba4fbe9bdef3b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 7 Mar 2008 10:32:40 -0800 Subject: [PATCH] client: fix ipquad macro --- src/kernel/inode.c | 1 - src/kernel/messenger.c | 7 ------- src/kernel/super.h | 8 ++++---- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/kernel/inode.c b/src/kernel/inode.c index 3c9511e16b70f..4486c54eb8b1c 100644 --- 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 daf12267cc04e..ddf5807a99372 100644 --- 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 d1055c4c14d97..045f30632d4bb 100644 --- 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)) /* -- 2.39.5