diff options
| author | Philipp Reisner | 2010-05-27 14:49:27 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2010-10-14 14:23:45 +0200 |
| commit | 7e602c0aaf3e686c36cc742119f0f53f42e9befe (patch) | |
| tree | 788ffe2a83d907cbd83b650997775eeac2bc6b1b /drivers/block/drbd/drbd_main.c | |
| parent | amiga floppy: Compile failure fixes (diff) | |
| download | kernel-qcow2-linux-7e602c0aaf3e686c36cc742119f0f53f42e9befe.tar.gz kernel-qcow2-linux-7e602c0aaf3e686c36cc742119f0f53f42e9befe.tar.xz kernel-qcow2-linux-7e602c0aaf3e686c36cc742119f0f53f42e9befe.zip | |
drbd: renamed drbd_tl_epoch.n_req to drbd_tl_epoch.n_writes
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index fa650dd85b90..a9bc6bc62400 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -199,7 +199,7 @@ static int tl_init(struct drbd_conf *mdev) INIT_LIST_HEAD(&b->w.list); b->next = NULL; b->br_number = 4711; - b->n_req = 0; + b->n_writes = 0; b->w.cb = NULL; /* if this is != NULL, we need to dec_ap_pending in tl_clear */ mdev->oldest_tle = b; @@ -240,7 +240,7 @@ void _tl_add_barrier(struct drbd_conf *mdev, struct drbd_tl_epoch *new) INIT_LIST_HEAD(&new->w.list); new->w.cb = NULL; /* if this is != NULL, we need to dec_ap_pending in tl_clear */ new->next = NULL; - new->n_req = 0; + new->n_writes = 0; newest_before = mdev->newest_tle; /* never send a barrier number == 0, because that is special-cased @@ -284,9 +284,9 @@ void tl_release(struct drbd_conf *mdev, unsigned int barrier_nr, barrier_nr, b->br_number); goto bail; } - if (b->n_req != set_size) { - dev_err(DEV, "BAD! BarrierAck #%u received with n_req=%u, expected n_req=%u!\n", - barrier_nr, set_size, b->n_req); + if (b->n_writes != set_size) { + dev_err(DEV, "BAD! BarrierAck #%u received with n_writes=%u, expected n_writes=%u!\n", + barrier_nr, set_size, b->n_writes); goto bail; } @@ -378,7 +378,7 @@ void tl_clear(struct drbd_conf *mdev) INIT_LIST_HEAD(&b->w.list); b->w.cb = NULL; b->br_number = new_initial_bnr; - b->n_req = 0; + b->n_writes = 0; mdev->oldest_tle = b; break; |