1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-09 01:18:39 +03:00

Remove some whitespaces.

(test commit)
This commit is contained in:
Milan Broz 2012-03-10 09:32:46 +00:00
parent 6b85d4df44
commit 06a9a4e867
6 changed files with 16 additions and 16 deletions

View File

@ -506,7 +506,7 @@ static int _lock_resource(char *resource, int mode, int flags, int *lockid)
saLckResourceClose(res_handle); saLckResourceClose(res_handle);
return ais_to_errno(err); return ais_to_errno(err);
} }
/* Wait for it to complete */ /* Wait for it to complete */
DEBUGLOG("lock_resource returning %d, lock_id=%" PRIx64 "\n", DEBUGLOG("lock_resource returning %d, lock_id=%" PRIx64 "\n",

View File

@ -89,7 +89,7 @@ struct checkpoint_data {
char *clean_bits; char *clean_bits;
char *recovering_region; char *recovering_region;
struct checkpoint_data *next; struct checkpoint_data *next;
}; };
#define INVALID 0 #define INVALID 0
#define VALID 1 #define VALID 1
@ -911,9 +911,9 @@ static int resend_requests(struct clog_cpg *entry)
rq->u_rq.data_size = 0; rq->u_rq.data_size = 0;
kernel_send(&rq->u_rq); kernel_send(&rq->u_rq);
break; break;
default: default:
/* /*
* If an action or a response is required, then * If an action or a response is required, then
@ -1355,7 +1355,7 @@ static void cpg_leave_callback(struct clog_cpg *match,
match->free_me = 1; match->free_me = 1;
match->lowest_id = 0xDEAD; match->lowest_id = 0xDEAD;
match->state = INVALID; match->state = INVALID;
} }
/* Remove any pending checkpoints for the leaving node. */ /* Remove any pending checkpoints for the leaving node. */
for (p_cp = NULL, c_cp = match->checkpoint_list; for (p_cp = NULL, c_cp = match->checkpoint_list;
@ -1411,7 +1411,7 @@ static void cpg_leave_callback(struct clog_cpg *match,
left->nodeid); left->nodeid);
return; return;
} }
match->lowest_id = member_list[0].nodeid; match->lowest_id = member_list[0].nodeid;
for (i = 0; i < member_list_entries; i++) for (i = 0; i < member_list_entries; i++)
if (match->lowest_id > member_list[i].nodeid) if (match->lowest_id > member_list[i].nodeid)
@ -1530,7 +1530,7 @@ unlink_retry:
usleep(1000); usleep(1000);
goto unlink_retry; goto unlink_retry;
} }
if (rv != SA_AIS_OK) { if (rv != SA_AIS_OK) {
LOG_ERROR("[%s] Failed to unlink checkpoint: %s", LOG_ERROR("[%s] Failed to unlink checkpoint: %s",
SHORT_UUID(entry->name.value), str_ais_error(rv)); SHORT_UUID(entry->name.value), str_ais_error(rv));
@ -1633,7 +1633,7 @@ static int _destroy_cluster_cpg(struct clog_cpg *del)
{ {
int r; int r;
int state; int state;
LOG_COND(log_resend_requests, "[%s] I am leaving.2.....", LOG_COND(log_resend_requests, "[%s] I am leaving.2.....",
SHORT_UUID(del->name.value)); SHORT_UUID(del->name.value));

View File

@ -784,7 +784,7 @@ static int clog_resume(struct dm_ulog_request *rq)
else if (lc->disk_nr_regions > lc->region_count) else if (lc->disk_nr_regions > lc->region_count)
LOG_DBG("[%s] Mirror has shrunk, updating log bits", LOG_DBG("[%s] Mirror has shrunk, updating log bits",
SHORT_UUID(lc->uuid)); SHORT_UUID(lc->uuid));
break; break;
case -EINVAL: case -EINVAL:
LOG_DBG("[%s] (Re)initializing mirror log - resync issued.", LOG_DBG("[%s] (Re)initializing mirror log - resync issued.",
SHORT_UUID(lc->uuid)); SHORT_UUID(lc->uuid));
@ -837,7 +837,7 @@ out:
lc->sync_search = 0; lc->sync_search = 0;
lc->state = LOG_RESUMED; lc->state = LOG_RESUMED;
lc->recovery_halted = 0; lc->recovery_halted = 0;
return rq->error; return rq->error;
} }
@ -1032,7 +1032,7 @@ static int clog_flush(struct dm_ulog_request *rq, int server)
{ {
int r = 0; int r = 0;
struct log_c *lc = get_log(rq->uuid, rq->luid); struct log_c *lc = get_log(rq->uuid, rq->luid);
if (!lc) if (!lc)
return -EINVAL; return -EINVAL;
@ -1614,7 +1614,7 @@ out:
rq->data_size = sizeof(*pkg); rq->data_size = sizeof(*pkg);
return 0; return 0;
} }

View File

@ -58,7 +58,7 @@ int links_register(int fd, const char *name, int (*callback)(void *data), void *
free(lc); free(lc);
return -ENOMEM; return -ENOMEM;
} }
pfds = tmp; pfds = tmp;
free_pfds = used_pfds + 1; free_pfds = used_pfds + 1;
} }
@ -125,7 +125,7 @@ int links_monitor(void)
for (i = 0; i < used_pfds; i++) for (i = 0; i < used_pfds; i++)
if (pfds[i].revents & POLLIN) { if (pfds[i].revents & POLLIN) {
LOG_DBG("Data ready on %d", pfds[i].fd); LOG_DBG("Data ready on %d", pfds[i].fd);
/* FIXME: Add this back return 1;*/ /* FIXME: Add this back return 1;*/
r++; r++;
} }

View File

@ -249,7 +249,7 @@ static int do_local_work(void *data __attribute__((unused)))
if (r) if (r)
LOG_ERROR("Failed to respond to kernel [%s]", LOG_ERROR("Failed to respond to kernel [%s]",
RQ_TYPE(u_rq->request_type)); RQ_TYPE(u_rq->request_type));
break; break;
case DM_ULOG_RESUME: case DM_ULOG_RESUME:
/* /*

View File

@ -124,7 +124,7 @@ static int _get_mirror_event(char *params)
out: out:
dm_free(args); dm_free(args);
return r; return r;
out_parse: out_parse:
dm_free(args); dm_free(args);
syslog(LOG_ERR, "Unable to parse mirror status string."); syslog(LOG_ERR, "Unable to parse mirror status string.");