From c759b3c246fce0798ef3b3783a450fbbf188b414 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 17 Aug 2012 09:47:49 -0700 Subject: [PATCH] --- yaml --- r: 331635 b: refs/heads/master c: 290e33593d76d1cebf873da50e036559c4820af9 h: refs/heads/master i: 331633: ea2e8444833d11ee3e08edad4121ba9364e56f75 331631: 170869446c6dc87be40d0d63c278323228e52d26 v: v3 --- [refs] | 2 +- trunk/include/linux/ceph/mon_client.h | 1 - trunk/net/ceph/mon_client.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bef186d6b62c..0f4beeec7002 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c98f533c9497e285109a047bfb955d683f33f7e4 +refs/heads/master: 290e33593d76d1cebf873da50e036559c4820af9 diff --git a/trunk/include/linux/ceph/mon_client.h b/trunk/include/linux/ceph/mon_client.h index 2113e3850a4e..1dc508aeb73d 100644 --- a/trunk/include/linux/ceph/mon_client.h +++ b/trunk/include/linux/ceph/mon_client.h @@ -71,7 +71,6 @@ struct ceph_mon_client { int cur_mon; /* last monitor i contacted */ unsigned long sub_sent, sub_renew_after; struct ceph_connection con; - bool have_fsid; /* pending generic requests */ struct rb_root generic_request_tree; diff --git a/trunk/net/ceph/mon_client.c b/trunk/net/ceph/mon_client.c index 900ea0f043fc..e98f6070b5ae 100644 --- a/trunk/net/ceph/mon_client.c +++ b/trunk/net/ceph/mon_client.c @@ -769,7 +769,6 @@ static int build_initial_monmap(struct ceph_mon_client *monc) monc->monmap->mon_inst[i].name.num = cpu_to_le64(i); } monc->monmap->num_mon = num_mon; - monc->have_fsid = false; return 0; }