diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-10-14 11:16:59 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-10-14 11:16:59 +1100 |
commit | 551e95502765bae58d5ccf57635e4977b7b47b9b (patch) | |
tree | d0c797cbc5044a882e1aac6094f661edb2c070d1 /source3/torture | |
parent | 9dcbddd5c61e8bf2814e97e53e7c518df87661c0 (diff) | |
parent | 4746f79d50d804b0e9d5d5cc0d4796dee54d052c (diff) | |
download | samba-551e95502765bae58d5ccf57635e4977b7b47b9b.tar.gz samba-551e95502765bae58d5ccf57635e4977b7b47b9b.tar.bz2 samba-551e95502765bae58d5ccf57635e4977b7b47b9b.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
Diffstat (limited to 'source3/torture')
-rw-r--r-- | source3/torture/cmd_vfs.c | 2 | ||||
-rw-r--r-- | source3/torture/locktest.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c index dddd5bef29..d984dd661c 100644 --- a/source3/torture/cmd_vfs.c +++ b/source3/torture/cmd_vfs.c @@ -105,7 +105,7 @@ static NTSTATUS cmd_disconnect(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int a static NTSTATUS cmd_disk_free(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, const char **argv) { - SMB_BIG_UINT diskfree, bsize, dfree, dsize; + uint64_t diskfree, bsize, dfree, dsize; if (argc != 2) { printf("Usage: disk_free <path>\n"); return NT_STATUS_OK; diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c index 2ba5ab8f06..b58cb3deec 100644 --- a/source3/torture/locktest.c +++ b/source3/torture/locktest.c @@ -71,7 +71,7 @@ struct record { enum lock_op lock_op; enum brl_type lock_type; char conn, f; - SMB_BIG_UINT start, len; + uint64_t start, len; char needed; }; @@ -303,8 +303,8 @@ static bool test_one(struct cli_state *cli[NSERVERS][NCONNECTIONS], { unsigned conn = rec->conn; unsigned f = rec->f; - SMB_BIG_UINT start = rec->start; - SMB_BIG_UINT len = rec->len; + uint64_t start = rec->start; + uint64_t len = rec->len; enum brl_type op = rec->lock_type; int server; bool ret[NSERVERS]; |