diff options
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/hastd/activemap.c | 2 | ||||
| -rw-r--r-- | sbin/hastd/hastd.8 | 2 | ||||
| -rw-r--r-- | sbin/hastd/hastd.c | 12 | ||||
| -rw-r--r-- | sbin/hastd/primary.c | 6 | ||||
| -rw-r--r-- | sbin/hastd/proto_tcp4.c | 2 | ||||
| -rw-r--r-- | sbin/hastd/secondary.c | 4 | ||||
| -rw-r--r-- | sbin/hastd/subr.c | 8 |
7 files changed, 18 insertions, 18 deletions
diff --git a/sbin/hastd/activemap.c b/sbin/hastd/activemap.c index 10eb64103057..877cfa2dfa47 100644 --- a/sbin/hastd/activemap.c +++ b/sbin/hastd/activemap.c @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); #define ACTIVEMAP_MAGIC 0xac71e4 struct activemap { int am_magic; /* Magic value. */ - off_t am_mediasize; /* Media size in bytes. */ + off_t am_mediasize; /* Media size in bytes. */ uint32_t am_extentsize; /* Extent size in bytes, must be power of 2. */ uint8_t am_extentshift;/* 2 ^ extentbits == extentsize */ diff --git a/sbin/hastd/hastd.8 b/sbin/hastd/hastd.8 index 84896560b681..5cbe70ad805b 100644 --- a/sbin/hastd/hastd.8 +++ b/sbin/hastd/hastd.8 @@ -95,7 +95,7 @@ following option: .Bd -ragged -offset indent .Cd "options GEOM_GATE" .Ed -.Pp +.Pp The connection between two .Nm daemons is always initiated from the one running as primary to the one diff --git a/sbin/hastd/hastd.c b/sbin/hastd/hastd.c index 3f09cc76196d..5af814b70fde 100644 --- a/sbin/hastd/hastd.c +++ b/sbin/hastd/hastd.c @@ -132,19 +132,19 @@ dtype2str(mode_t mode) if (S_ISBLK(mode)) return ("block device"); - else if (S_ISCHR(mode)) + else if (S_ISCHR(mode)) return ("character device"); - else if (S_ISDIR(mode)) + else if (S_ISDIR(mode)) return ("directory"); else if (S_ISFIFO(mode)) return ("pipe or FIFO"); - else if (S_ISLNK(mode)) + else if (S_ISLNK(mode)) return ("symbolic link"); - else if (S_ISREG(mode)) + else if (S_ISREG(mode)) return ("regular file"); else if (S_ISSOCK(mode)) return ("socket"); - else if (S_ISWHT(mode)) + else if (S_ISWHT(mode)) return ("whiteout"); else return ("unknown"); @@ -929,7 +929,7 @@ main_loop(void) time_t lastcheck, now; fd_set rfds; - lastcheck = time(NULL); + lastcheck = time(NULL); seltimeout.tv_sec = REPORT_INTERVAL; seltimeout.tv_usec = 0; diff --git a/sbin/hastd/primary.c b/sbin/hastd/primary.c index 73f8f6536c38..8f6ec46fb0e2 100644 --- a/sbin/hastd/primary.c +++ b/sbin/hastd/primary.c @@ -183,7 +183,7 @@ static pthread_mutex_t metadata_lock; while (((hio) = TAILQ_FIRST(&hio_##name##_list[(ncomp)])) == NULL && !_last) { \ cv_timedwait(&hio_##name##_list_cond[(ncomp)], \ &hio_##name##_list_lock[(ncomp)], (timeout)); \ - if ((timeout) != 0) \ + if ((timeout) != 0) \ _last = true; \ } \ if (hio != NULL) { \ @@ -1268,7 +1268,7 @@ keepalive_send(struct hast_resource *res, unsigned int ncomp) rw_unlock(&hio_remote_lock[ncomp]); return; } - + PJDLOG_ASSERT(res->hr_remotein != NULL); PJDLOG_ASSERT(res->hr_remoteout != NULL); @@ -1314,7 +1314,7 @@ remote_send_thread(void *arg) /* Remote component is 1 for now. */ ncomp = 1; - lastcheck = time(NULL); + lastcheck = time(NULL); for (;;) { pjdlog_debug(2, "remote_send: Taking request."); diff --git a/sbin/hastd/proto_tcp4.c b/sbin/hastd/proto_tcp4.c index 11b19a596dbb..7435e76c56c8 100644 --- a/sbin/hastd/proto_tcp4.c +++ b/sbin/hastd/proto_tcp4.c @@ -337,7 +337,7 @@ tcp4_connect_wait(void *ctx, int timeout) tv.tv_usec = 0; again: FD_ZERO(&fdset); - FD_SET(tctx->tc_fd, &fdset); + FD_SET(tctx->tc_fd, &fdset); ret = select(tctx->tc_fd + 1, NULL, &fdset, NULL, &tv); if (ret == 0) { error = ETIMEDOUT; diff --git a/sbin/hastd/secondary.c b/sbin/hastd/secondary.c index cdcab0af9a52..39aa40458865 100644 --- a/sbin/hastd/secondary.c +++ b/sbin/hastd/secondary.c @@ -65,8 +65,8 @@ __FBSDID("$FreeBSD$"); #include "synch.h" struct hio { - uint64_t hio_seq; - int hio_error; + uint64_t hio_seq; + int hio_error; struct nv *hio_nv; void *hio_data; uint8_t hio_cmd; diff --git a/sbin/hastd/subr.c b/sbin/hastd/subr.c index aa6e5d9a8b08..49881e796f2e 100644 --- a/sbin/hastd/subr.c +++ b/sbin/hastd/subr.c @@ -134,12 +134,12 @@ const char * role2str(int role) { - switch (role) { - case HAST_ROLE_INIT: + switch (role) { + case HAST_ROLE_INIT: return ("init"); - case HAST_ROLE_PRIMARY: + case HAST_ROLE_PRIMARY: return ("primary"); - case HAST_ROLE_SECONDARY: + case HAST_ROLE_SECONDARY: return ("secondary"); } return ("unknown"); |