While cancelling, we store the OSD epoch at time
of cancellation, this will be used later in
CAPRELEASE messages.
Signed-off-by: John Spray <john.spray@xxxxxxxxxx>
---
fs/ceph/mds_client.c | 21 +++++++++++++++++++++
fs/ceph/mds_client.h | 1 +
2 files changed, 22 insertions(+)
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 9f00853..dce7977 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -3265,6 +3265,23 @@ static void delayed_work(struct work_struct *work)
schedule_delayed(mdsc);
}
+/**
+ * Call this with map_sem held for read
+ */
+static void handle_osd_map(struct ceph_osd_client *osdc, void *p)
+{
+ struct ceph_mds_client *mdsc = (struct ceph_mds_client*)p;
+ u32 cancelled_epoch = 0;
+
+ if (osdc->osdmap->flags & CEPH_OSDMAP_FULL) {
+ cancelled_epoch = ceph_osdc_cancel_writes(osdc, -ENOSPC);
+ if (cancelled_epoch) {
+ mdsc->cap_epoch_barrier = max(cancelled_epoch + 1,
+ mdsc->cap_epoch_barrier);
+ }
+ }
+}
+
int ceph_mdsc_init(struct ceph_fs_client *fsc)
{
@@ -3311,6 +3328,10 @@ int ceph_mdsc_init(struct ceph_fs_client *fsc)
ceph_caps_init(mdsc);
ceph_adjust_min_caps(mdsc, fsc->min_caps);
+ mdsc->cap_epoch_barrier = 0;
+
+ ceph_osdc_register_map_cb(&fsc->client->osdc,
+ handle_osd_map, (void*)mdsc);
return 0;
}
diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index 230bda7..7b40568 100644
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -298,6 +298,7 @@ struct ceph_mds_client {
int num_cap_flushing; /* # caps we are flushing */
spinlock_t cap_dirty_lock; /* protects above items */
wait_queue_head_t cap_flushing_wq;
+ u32 cap_epoch_barrier;
/*
* Cap reservations
--
1.9.3
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
