From 85e1207535d9fc2d865a35a88dbfe74047b4b6b7 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 4 Nov 2009 11:46:35 -0800
Subject: [PATCH] --- yaml --- r: 188606 b: refs/heads/master c:
 f28bcfbe660a3246621a367020054d4f1a179cd9 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/ceph/messenger.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4d434c729f9c..0c0d7049e9c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a18be16f7513ea8a4923c161ce073987932cbdb
+refs/heads/master: f28bcfbe660a3246621a367020054d4f1a179cd9
diff --git a/trunk/fs/ceph/messenger.c b/trunk/fs/ceph/messenger.c
index 6ff44bbddf67..5cc374850d8f 100644
--- a/trunk/fs/ceph/messenger.c
+++ b/trunk/fs/ceph/messenger.c
@@ -891,9 +891,9 @@ static int addr_port(struct sockaddr_storage *ss)
 {
 	switch (ss->ss_family) {
 	case AF_INET:
-		return ((struct sockaddr_in *)ss)->sin_port;
+		return ntohs(((struct sockaddr_in *)ss)->sin_port);
 	case AF_INET6:
-		return ((struct sockaddr_in6 *)ss)->sin6_port;
+		return ntohs(((struct sockaddr_in6 *)ss)->sin6_port);
 	}
 	return 0;
 }