hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drbd: send_bitmap_rle_or_plain: Get rid of ugly and useless enum 

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Andreas Gruenbacher 2010-12-11 18:51:50 +01:00 committed by Philipp Reisner
parent 78fcbdae22
commit f70af118e3
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/block/drbd/drbd_main.c
View File

@ -2140,7 +2140,13 @@ int fill_bitmap_rle_bits(struct drbd_conf *mdev,
return len; return len;
} }
enum { OK, FAILED, DONE } /**
* send_bitmap_rle_or_plain
*
* Return 0 when done, 1 when another iteration is needed, and a negative error
* code upon failure.
*/
static int
send_bitmap_rle_or_plain(struct drbd_conf *mdev, send_bitmap_rle_or_plain(struct drbd_conf *mdev,
struct p_header80 *h, struct bm_xfer_ctx *c) struct p_header80 *h, struct bm_xfer_ctx *c)
{ {
@ -2152,7 +2158,7 @@ send_bitmap_rle_or_plain(struct drbd_conf *mdev,
len = fill_bitmap_rle_bits(mdev, p, c); len = fill_bitmap_rle_bits(mdev, p, c);
if (len < 0) if (len < 0)
return FAILED; return -EIO;
if (len) { if (len) {
DCBP_set_code(p, RLE_VLI_Bits); DCBP_set_code(p, RLE_VLI_Bits);
@ -2182,11 +2188,14 @@ send_bitmap_rle_or_plain(struct drbd_conf *mdev,
if (c->bit_offset > c->bm_bits) if (c->bit_offset > c->bm_bits)
c->bit_offset = c->bm_bits; c->bit_offset = c->bm_bits;
} }
ok = ok ? ((len == 0) ? DONE : OK) : FAILED; if (ok) {
if (len == 0) {
if (ok == DONE)
INFO_bm_xfer_stats(mdev, "send", c); INFO_bm_xfer_stats(mdev, "send", c);
return ok; return 0;
} else
return 1;
}
return -EIO;
} }
/* See the comment at receive_bitmap() */ /* See the comment at receive_bitmap() */
@ -2194,7 +2203,7 @@ int _drbd_send_bitmap(struct drbd_conf *mdev)
{ {
struct bm_xfer_ctx c; struct bm_xfer_ctx c;
struct p_header80 *p; struct p_header80 *p;
int ret; int err;
ERR_IF(!mdev->bitmap) return false; ERR_IF(!mdev->bitmap) return false;
@ -2229,11 +2238,11 @@ int _drbd_send_bitmap(struct drbd_conf *mdev)
}; };
do { do {
ret = send_bitmap_rle_or_plain(mdev, p, &c); err = send_bitmap_rle_or_plain(mdev, p, &c);
} while (ret == OK); } while (err > 0);
free_page((unsigned long) p); free_page((unsigned long) p);
return (ret == DONE); return err == 0;
} }
int drbd_send_bitmap(struct drbd_conf *mdev) int drbd_send_bitmap(struct drbd_conf *mdev)