diff options
| author | trociny <trociny@FreeBSD.org> | 2013-12-10 19:58:10 +0000 |
|---|---|---|
| committer | trociny <trociny@FreeBSD.org> | 2013-12-10 19:58:10 +0000 |
| commit | 4c419dee1408dd302d13eefce1a8c4a41daeafb5 (patch) | |
| tree | 679d793f09f1ffd4a38af75925f0f5c016ec60c8 /sbin/hastd | |
| parent | 6adb8637fe18ceda2cdd24dbf8c4c96d00537482 (diff) | |
| download | FreeBSD-src-4c419dee1408dd302d13eefce1a8c4a41daeafb5.zip FreeBSD-src-4c419dee1408dd302d13eefce1a8c4a41daeafb5.tar.gz | |
Add some macros to make the code more readable (no functional chages).
MFC after: 2 weeks
Diffstat (limited to 'sbin/hastd')
| -rw-r--r-- | sbin/hastd/primary.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sbin/hastd/primary.c b/sbin/hastd/primary.c index 9c3645f..112611a 100644 --- a/sbin/hastd/primary.c +++ b/sbin/hastd/primary.c @@ -233,6 +233,10 @@ static pthread_mutex_t metadata_lock; mtx_unlock(&hio_##name##_list_lock); \ } while (0) +#define ISFULLSYNC(hio) ((hio)->hio_replication == HAST_REPLICATION_FULLSYNC) +#define ISMEMSYNC(hio) ((hio)->hio_replication == HAST_REPLICATION_MEMSYNC) +#define ISASYNC(hio) ((hio)->hio_replication == HAST_REPLICATION_ASYNC) + #define SYNCREQ(hio) do { \ (hio)->hio_ggio.gctl_unit = -1; \ (hio)->hio_ggio.gctl_seq = 1; \ @@ -240,9 +244,9 @@ static pthread_mutex_t metadata_lock; #define ISSYNCREQ(hio) ((hio)->hio_ggio.gctl_unit == -1) #define SYNCREQDONE(hio) do { (hio)->hio_ggio.gctl_unit = -2; } while (0) #define ISSYNCREQDONE(hio) ((hio)->hio_ggio.gctl_unit == -2) -#define ISMEMSYNCWRITE(hio) \ - (((hio)->hio_replication == HAST_REPLICATION_MEMSYNC && \ - (hio)->hio_ggio.gctl_cmd == BIO_WRITE && !ISSYNCREQ(hio))) + +#define ISMEMSYNCWRITE(hio) (ISMEMSYNC(hio) && \ + (hio)->hio_ggio.gctl_cmd == BIO_WRITE && !ISSYNCREQ(hio)) static struct hast_resource *gres; @@ -1356,7 +1360,7 @@ ggate_recv_thread(void *arg) } else { mtx_unlock(&res->hr_amp_lock); } - if (hio->hio_replication == HAST_REPLICATION_MEMSYNC) { + if (ISMEMSYNC(hio)) { hio->hio_memsyncacked = false; refcnt_init(&hio->hio_writecount, ncomps); } @@ -1441,8 +1445,7 @@ local_send_thread(void *arg) ret, (intmax_t)ggio->gctl_length); } else { hio->hio_errors[ncomp] = 0; - if (hio->hio_replication == - HAST_REPLICATION_ASYNC) { + if (ISASYNC(hio)) { ggio->gctl_error = 0; write_complete(res, hio); } |
