diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-05-29 09:30:34 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:22:52 -0500 |
| commit | e8156439f24137b5418baad20a7f00f6949cfe29 (patch) | |
| tree | b2d6a876be7a2d7b763402e33e1653899430d48d /source3/torture | |
| parent | ba0bce2c6f7298840e0d223a5f170b777b8c9d64 (diff) | |
| download | samba-e8156439f24137b5418baad20a7f00f6949cfe29.tar.gz samba-e8156439f24137b5418baad20a7f00f6949cfe29.tar.bz2 samba-e8156439f24137b5418baad20a7f00f6949cfe29.zip | |
r23183: Check in a change made by Tridge:
This replaces the internal explicit dev/ino file id representation by a
"struct file_id". This is necessary as cluster file systems and NFS
don't necessarily assign the same device number to the shared file
system. With this structure in place we can now easily add different
schemes to map a file to a unique 64-bit device node.
Jeremy, you might note that I did not change the external interface of
smb_share_modes.c.
Volker
(This used to be commit 9b10dbbd5de8813fc15ebbb6be9b18010ffe8139)
Diffstat (limited to 'source3/torture')
| -rw-r--r-- | source3/torture/locktest.c | 7 | ||||
| -rw-r--r-- | source3/torture/locktest2.c | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c index 792ada61a9..92838f0ff2 100644 --- a/source3/torture/locktest.c +++ b/source3/torture/locktest.c @@ -116,8 +116,7 @@ static struct record preset[] = { static struct record *recorded; -static void print_brl(SMB_DEV_T dev, - SMB_INO_T ino, +static void print_brl(struct file_id id, struct server_id pid, enum brl_type lock_type, enum brl_flavour lock_flav, @@ -138,8 +137,8 @@ static void print_brl(SMB_DEV_T dev, } #endif - printf("%s %05x:%05x %s %.0f:%.0f(%.0f)\n", - procid_str_static(&pid), (int)dev, (int)ino, + printf("%s %s %s %.0f:%.0f(%.0f)\n", + procid_str_static(&pid), file_id_static_string(&id), lock_type==READ_LOCK?"R":"W", (double)start, (double)start+size-1,(double)size); diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c index 7153401022..184c84be43 100644 --- a/source3/torture/locktest2.c +++ b/source3/torture/locktest2.c @@ -136,13 +136,13 @@ 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 server_id pid, +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) { - printf("%6d %05x:%05x %s %.0f:%.0f(%.0f)\n", - (int)procid_to_pid(&pid), (int)dev, (int)ino, + printf("%6d %s %s %.0f:%.0f(%.0f)\n", + (int)procid_to_pid(&pid), file_id_static_string(&id), lock_type==READ_LOCK?"R":"W", (double)start, (double)start+size-1,(double)size); |