diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-07-26 01:52:21 +0200 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-26 01:52:21 +0200 |
commit | 5ffdcd94ea0171cf9a3ca63051c2246426103b5b (patch) | |
tree | dfa1522796d5af649caf64ac6e2f1e69119e85d0 /fs/ceph/mon_client.c | |
parent | spi/mpc5121: change annotations for probe and remove functions (diff) | |
parent | Linux 2.6.35-rc6 (diff) | |
download | linux-5ffdcd94ea0171cf9a3ca63051c2246426103b5b.tar.xz linux-5ffdcd94ea0171cf9a3ca63051c2246426103b5b.zip |
Merge commit 'v2.6.35-rc6' into spi/test
Diffstat (limited to 'fs/ceph/mon_client.c')
-rw-r--r-- | fs/ceph/mon_client.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ceph/mon_client.c b/fs/ceph/mon_client.c index 07a539906e67..cc115eafae11 100644 --- a/fs/ceph/mon_client.c +++ b/fs/ceph/mon_client.c @@ -725,7 +725,8 @@ static void handle_auth_reply(struct ceph_mon_client *monc, dout("authenticated, starting session\n"); monc->client->msgr->inst.name.type = CEPH_ENTITY_TYPE_CLIENT; - monc->client->msgr->inst.name.num = monc->auth->global_id; + monc->client->msgr->inst.name.num = + cpu_to_le64(monc->auth->global_id); __send_subscribe(monc); __resend_generic_request(monc); |