drbd: Update some comments

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index e6cc6301db02e7a37a0170368bf327e5a8f8a37e..c7504579c46ee73e10082a7eea8690b319d6d22e 100644 (file)
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -727,7 +727,7 @@ enum {
         * we need to resubmit without the barrier flag. */
        __EE_RESUBMITTED,
 
-       /* we may have several bios per epoch entry.
+       /* we may have several bios per peer request.
         * if any of those fail, we set this flag atomically
         * from the endio callback */
        __EE_WAS_ERROR,
@@ -1422,7 +1422,7 @@ extern void drbd_bm_unlock(struct drbd_conf *mdev);
 /* drbd_main.c */
 
 extern struct kmem_cache *drbd_request_cache;
-extern struct kmem_cache *drbd_ee_cache;       /* epoch entries */
+extern struct kmem_cache *drbd_ee_cache;       /* peer requests */
 extern struct kmem_cache *drbd_bm_ext_cache;   /* bitmap extents */
 extern struct kmem_cache *drbd_al_ext_cache;   /* activity log extents */
 extern mempool_t *drbd_request_mempool;

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 62f20dfc9b545cffffac96ae562047d041a2ead7..3bc900f48f96d57465963044fc560a2852b0e88f 100644 (file)
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -135,7 +135,7 @@ struct drbd_conf **minor_table;
 struct list_head drbd_tconns;  /* list of struct drbd_tconn */
 
 struct kmem_cache *drbd_request_cache;
-struct kmem_cache *drbd_ee_cache;      /* epoch entries */
+struct kmem_cache *drbd_ee_cache;      /* peer requests */
 struct kmem_cache *drbd_bm_ext_cache;  /* bitmap extents */
 struct kmem_cache *drbd_al_ext_cache;  /* activity log extents */
 mempool_t *drbd_request_mempool;

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index e061aca2d93a72ed58b3a160452c62249a51b5c6..6ba94febfab1b251311c4976fd218223552042e7 100644 (file)
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -1085,7 +1085,7 @@ void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo)
 /**
  * drbd_submit_ee()
  * @mdev:      DRBD device.
- * @e:         epoch entry
+ * @e:         peer request
  * @rw:                flag field, see bio->bi_rw
  *
  * May spread the pages to multiple bios,
@@ -1182,7 +1182,7 @@ static void drbd_remove_epoch_entry_interval(struct drbd_conf *mdev,
        drbd_remove_interval(&mdev->write_requests, i);
        drbd_clear_interval(i);
 
-       /* Wake up any processes waiting for this epoch entry to complete.  */
+       /* Wake up any processes waiting for this peer request to complete.  */
        if (i->waiting)
                wake_up(&mdev->misc_wait);
 }