diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-05-07 09:35:35 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:21:52 -0500 |
| commit | e6383f47629368d9dd4e803f17566a24e9d7359e (patch) | |
| tree | cebde89910087c3220786f209da2c4e32a71bc46 /source3/torture | |
| parent | d1153fc79076741571b203b1d70f1536bde208f0 (diff) | |
| download | samba-e6383f47629368d9dd4e803f17566a24e9d7359e.tar.gz samba-e6383f47629368d9dd4e803f17566a24e9d7359e.tar.bz2 samba-e6383f47629368d9dd4e803f17566a24e9d7359e.zip | |
r22736: Start to merge the low-hanging fruit from the now 7000-line cluster patch.
This changes "struct process_id" to "struct server_id", keeping both is
just too much hassle. No functional change (I hope ;-))
Volker
(This used to be commit 0ad4b1226c9d91b72136310d3bbb640d2c5d67b8)
Diffstat (limited to 'source3/torture')
| -rw-r--r-- | source3/torture/locktest.c | 2 | ||||
| -rw-r--r-- | source3/torture/locktest2.c | 2 | ||||
| -rw-r--r-- | source3/torture/msgtest.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c index d248a9459d..792ada61a9 100644 --- a/source3/torture/locktest.c +++ b/source3/torture/locktest.c @@ -118,7 +118,7 @@ static struct record *recorded; static void print_brl(SMB_DEV_T dev, SMB_INO_T ino, - struct process_id pid, + struct server_id pid, enum brl_type lock_type, enum brl_flavour lock_flav, br_off start, diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c index 0a897fb206..7153401022 100644 --- a/source3/torture/locktest2.c +++ b/source3/torture/locktest2.c @@ -136,7 +136,7 @@ static BOOL try_unlock(struct cli_state *c, int fstype, return False; } -static void print_brl(SMB_DEV_T dev, SMB_INO_T ino, struct process_id pid, +static void print_brl(SMB_DEV_T dev, SMB_INO_T ino, struct server_id pid, enum brl_type lock_type, enum brl_flavour lock_flav, br_off start, br_off size) diff --git a/source3/torture/msgtest.c b/source3/torture/msgtest.c index 5a066bc599..703832c7b4 100644 --- a/source3/torture/msgtest.c +++ b/source3/torture/msgtest.c @@ -29,7 +29,7 @@ static int pong_count; /**************************************************************************** a useful function for testing the message system ****************************************************************************/ -static void pong_message(int msg_type, struct process_id src, +static void pong_message(int msg_type, struct server_id src, void *buf, size_t len, void *private_data) { pong_count++; |