summaryrefslogtreecommitdiff
path: root/source3/torture
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-05-29 13:26:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:22:53 -0500
commitd3ed91d9e1f3ba9f3d5093b3607dd563b37c27ed (patch)
treec4eebf87de5196db0f67caa73137da4b45d8efe4 /source3/torture
parent86f79c402df9fca010719c4f7816ea35c3f42c75 (diff)
downloadsamba-d3ed91d9e1f3ba9f3d5093b3607dd563b37c27ed.tar.gz
samba-d3ed91d9e1f3ba9f3d5093b3607dd563b37c27ed.tar.bz2
samba-d3ed91d9e1f3ba9f3d5093b3607dd563b37c27ed.zip
r23195: Add void *private_data to brl_forall
(This used to be commit c91b2bdc160d76bf0b0770fe7f92cbc7124d6c3c)
Diffstat (limited to 'source3/torture')
-rw-r--r--source3/torture/locktest.c5
-rw-r--r--source3/torture/locktest2.c9
2 files changed, 8 insertions, 6 deletions
diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c
index 92838f0ff2..7a970488b3 100644
--- a/source3/torture/locktest.c
+++ b/source3/torture/locktest.c
@@ -121,7 +121,8 @@ static void print_brl(struct file_id id,
enum brl_type lock_type,
enum brl_flavour lock_flav,
br_off start,
- br_off size)
+ br_off size,
+ void *private_data)
{
#if NASTY_POSIX_LOCK_HACK
{
@@ -147,7 +148,7 @@ static void print_brl(struct file_id id,
static void show_locks(void)
{
- brl_forall(print_brl);
+ brl_forall(print_brl, NULL);
/* system("cat /proc/locks"); */
}
diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c
index 184c84be43..0da7e9cf00 100644
--- a/source3/torture/locktest2.c
+++ b/source3/torture/locktest2.c
@@ -139,7 +139,8 @@ static BOOL try_unlock(struct cli_state *c, int fstype,
static void print_brl(struct file_id id, struct server_id pid,
enum brl_type lock_type,
enum brl_flavour lock_flav,
- br_off start, br_off size)
+ br_off start, br_off size,
+ void *private_data)
{
printf("%6d %s %s %.0f:%.0f(%.0f)\n",
(int)procid_to_pid(&pid), file_id_static_string(&id),
@@ -259,7 +260,7 @@ static BOOL test_one(struct cli_state *cli[NSERVERS][NCONNECTIONS],
op==READ_LOCK?"READ_LOCK":"WRITE_LOCK",
ret[0], ret[1]);
}
- if (showall) brl_forall(print_brl);
+ if (showall) brl_forall(print_brl, NULL);
if (ret[0] != ret[1]) return False;
} else if (r2 < LOCK_PCT+UNLOCK_PCT) {
/* unset a lock */
@@ -274,7 +275,7 @@ static BOOL test_one(struct cli_state *cli[NSERVERS][NCONNECTIONS],
start, start+len-1, len,
ret[0], ret[1]);
}
- if (showall) brl_forall(print_brl);
+ if (showall) brl_forall(print_brl, NULL);
if (!hide_unlock_fails && ret[0] != ret[1]) return False;
} else {
/* reopen the file */
@@ -290,7 +291,7 @@ static BOOL test_one(struct cli_state *cli[NSERVERS][NCONNECTIONS],
if (showall) {
printf("reopen conn=%u fstype=%u f=%u\n",
conn, fstype, f);
- brl_forall(print_brl);
+ brl_forall(print_brl, NULL);
}
}
return True;