sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

ctdb-locking: Remove support for locking multiple databases

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12469

The code to lock multiple databases has been dropped from ctdb_lock.c.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
(cherry picked from commit 5b1076dc61f5e3f006c1b8cef98e7d2d3cc1bfba)
This commit is contained in:
Amitay Isaacs 2016-11-29 17:13:41 +11:00 committed by Karolin Seeger
parent 430cad1640
commit 727f5d4851
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ctdb/server/ctdb_lock_helper.c
View File

@ -72,7 +72,7 @@ static void usage(void)
fprintf(stderr, "\n");
fprintf(stderr, "Usage: %s <log-fd> <ctdbd-pid> <output-fd> RECORD <db-path> <db-flags> <db-key>\n",
progname);
fprintf(stderr, " %s <log-fd> <ctdbd-pid> <output-fd> DB <db1-path> <db1-flags> [<db2-path> <db2-flags>...]\n",
fprintf(stderr, " %s <log-fd> <ctdbd-pid> <output-fd> DB <db1-path> <db1-flags>\n",
progname);
}
@ -196,17 +196,14 @@ int main(int argc, char *argv[])
result = lock_record(argv[5], argv[6], argv[7]);
} else if (strcmp(lock_type, "DB") == 0) {
int n;
/* If there are no databases specified, no need for lock */
if (argc > 5) {
for (n=5; n+1<argc; n+=2) {
result = lock_db(argv[n], argv[n+1]);
if (result != 0) {
break;
}
}
if (argc != 7) {
fprintf(stderr,
"locking: Invalid number of arguments (%d)\n",
argc);
usage();
exit(1);
}
result = lock_db(argv[5], argv[6]);
} else {
fprintf(stderr, "%s: Invalid lock-type '%s'\n", progname, lock_type);