diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /net/ceph/mon_client.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'net/ceph/mon_client.c')
| -rw-r--r-- | net/ceph/mon_client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c index c83326c5ba58..ef34a02719d7 100644 --- a/net/ceph/mon_client.c +++ b/net/ceph/mon_client.c | |||
| @@ -574,7 +574,7 @@ static void complete_generic_request(struct ceph_mon_generic_request *req) | |||
| 574 | put_generic_request(req); | 574 | put_generic_request(req); |
| 575 | } | 575 | } |
| 576 | 576 | ||
| 577 | void cancel_generic_request(struct ceph_mon_generic_request *req) | 577 | static void cancel_generic_request(struct ceph_mon_generic_request *req) |
| 578 | { | 578 | { |
| 579 | struct ceph_mon_client *monc = req->monc; | 579 | struct ceph_mon_client *monc = req->monc; |
| 580 | struct ceph_mon_generic_request *lookup_req; | 580 | struct ceph_mon_generic_request *lookup_req; |