diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /net/ceph | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/osd_client.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 1606f740d6ae..2b4b32aaa893 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c | |||
| @@ -2216,6 +2216,17 @@ void ceph_osdc_sync(struct ceph_osd_client *osdc) | |||
| 2216 | EXPORT_SYMBOL(ceph_osdc_sync); | 2216 | EXPORT_SYMBOL(ceph_osdc_sync); |
| 2217 | 2217 | ||
| 2218 | /* | 2218 | /* |
| 2219 | * Call all pending notify callbacks - for use after a watch is | ||
| 2220 | * unregistered, to make sure no more callbacks for it will be invoked | ||
| 2221 | */ | ||
| 2222 | extern void ceph_osdc_flush_notifies(struct ceph_osd_client *osdc) | ||
| 2223 | { | ||
| 2224 | flush_workqueue(osdc->notify_wq); | ||
| 2225 | } | ||
| 2226 | EXPORT_SYMBOL(ceph_osdc_flush_notifies); | ||
| 2227 | |||
| 2228 | |||
| 2229 | /* | ||
| 2219 | * init, shutdown | 2230 | * init, shutdown |
| 2220 | */ | 2231 | */ |
| 2221 | int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client) | 2232 | int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client) |