[SCM] Samba Shared Repository - branch master updated - 4746f79d50d804b0e9d5d5cc0d4796dee54d052c

Jelmer Vernooij jelmer at samba.org
Tue Oct 14 00:09:43 GMT 2008


The branch, master has been updated
       via  4746f79d50d804b0e9d5d5cc0d4796dee54d052c (commit)
      from  abe443a65edf86892ce01c80804a4b644ec99433 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4746f79d50d804b0e9d5d5cc0d4796dee54d052c
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Oct 14 01:59:36 2008 +0200

    Use {u,}int64_t instead of SMB_BIG_{U,}INT.

-----------------------------------------------------------------------

Summary of changes:
 source3/client/client.c          |   16 +++---
 source3/client/clitar.c          |   28 +++++-----
 source3/include/client.h         |    2 +-
 source3/include/includes.h       |   23 ++------
 source3/include/nameserv.h       |    4 +-
 source3/include/ntquotas.h       |   26 ++++----
 source3/include/proto.h          |  110 ++++++++++++++++++------------------
 source3/include/smb.h            |   12 ++--
 source3/include/smbprofile.h     |    8 +-
 source3/include/sysquotas.h      |   20 +++---
 source3/include/vfs.h            |   16 +++---
 source3/lib/fsusage.c            |   20 +++---
 source3/lib/select.c             |    2 +-
 source3/lib/smbldap.c            |    2 +-
 source3/lib/sysquotas_4A.c       |   16 +++---
 source3/lib/sysquotas_linux.c    |   48 ++++++++--------
 source3/lib/sysquotas_xfs.c      |   16 +++---
 source3/lib/util_str.c           |   10 +--
 source3/libsmb/clifile.c         |   12 ++--
 source3/libsmb/cliquota.c        |   40 ++++++-------
 source3/libsmb/clireadwrite.c    |    6 +-
 source3/locking/locking.c        |   20 +++---
 source3/locking/posix.c          |   32 +++++-----
 source3/modules/vfs_cap.c        |    8 +-
 source3/modules/vfs_default.c    |    6 +-
 source3/modules/vfs_full_audit.c |   14 ++--
 source3/nmbd/nmbd_winsserver.c   |    6 +-
 source3/printing/printing.c      |    4 +-
 source3/registry/reg_perfcount.c |   10 ++--
 source3/smbd/blocking.c          |   24 ++++----
 source3/smbd/dfree.c             |   34 ++++++------
 source3/smbd/noquotas.c          |    6 +-
 source3/smbd/ntquotas.c          |   26 ++++----
 source3/smbd/nttrans.c           |   50 ++++++++--------
 source3/smbd/open.c              |    6 +-
 source3/smbd/process.c           |    2 +-
 source3/smbd/quotas.c            |  106 ++++++++++++++++++------------------
 source3/smbd/reply.c             |   92 +++++++++++++++---------------
 source3/smbd/statvfs.c           |    2 +-
 source3/smbd/trans2.c            |  114 +++++++++++++++++++-------------------
 source3/smbd/vfs.c               |   12 ++--
 source3/torture/cmd_vfs.c        |    2 +-
 source3/torture/locktest.c       |    6 +-
 source3/utils/smbcquotas.c       |    6 +--
 source3/utils/status_profile.c   |   12 ++--
 45 files changed, 507 insertions(+), 530 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/client/client.c b/source3/client/client.c
index eb9f31b..0fbf56f 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -84,9 +84,9 @@ static struct sockaddr_storage dest_ss;
 static bool abort_mget = true;
 
 /* timing globals */
-SMB_BIG_UINT get_total_size = 0;
+uint64_t get_total_size = 0;
 unsigned int get_total_time_ms = 0;
-static SMB_BIG_UINT put_total_size = 0;
+static uint64_t put_total_size = 0;
 static unsigned int put_total_time_ms = 0;
 
 /* totals globals */
@@ -2555,7 +2555,7 @@ static int cmd_lock(void)
 {
 	TALLOC_CTX *ctx = talloc_tos();
 	char *buf = NULL;
-	SMB_BIG_UINT start, len;
+	uint64_t start, len;
 	enum brl_type lock_type;
 	int fnum;
 
@@ -2584,14 +2584,14 @@ static int cmd_lock(void)
 		return 1;
 	}
 
-	start = (SMB_BIG_UINT)strtol(buf, (char **)NULL, 16);
+	start = (uint64_t)strtol(buf, (char **)NULL, 16);
 
 	if (!next_token_talloc(ctx, &cmd_ptr,&buf,NULL)) {
 		d_printf("lock <fnum> [r|w] <hex-start> <hex-len>\n");
 		return 1;
 	}
 
-	len = (SMB_BIG_UINT)strtol(buf, (char **)NULL, 16);
+	len = (uint64_t)strtol(buf, (char **)NULL, 16);
 
 	if (!cli_posix_lock(cli, fnum, start, len, true, lock_type)) {
 		d_printf("lock failed %d: %s\n", fnum, cli_errstr(cli));
@@ -2604,7 +2604,7 @@ static int cmd_unlock(void)
 {
 	TALLOC_CTX *ctx = talloc_tos();
 	char *buf = NULL;
-	SMB_BIG_UINT start, len;
+	uint64_t start, len;
 	int fnum;
 
 	if (!next_token_talloc(ctx, &cmd_ptr,&buf,NULL)) {
@@ -2618,14 +2618,14 @@ static int cmd_unlock(void)
 		return 1;
 	}
 
-	start = (SMB_BIG_UINT)strtol(buf, (char **)NULL, 16);
+	start = (uint64_t)strtol(buf, (char **)NULL, 16);
 
 	if (!next_token_talloc(ctx, &cmd_ptr,&buf,NULL)) {
 		d_printf("unlock <fnum> <hex-start> <hex-len>\n");
 		return 1;
 	}
 
-	len = (SMB_BIG_UINT)strtol(buf, (char **)NULL, 16);
+	len = (uint64_t)strtol(buf, (char **)NULL, 16);
 
 	if (!cli_posix_unlock(cli, fnum, start, len)) {
 		d_printf("unlock failed %d: %s\n", fnum, cli_errstr(cli));
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 084f87e..7ad8a73 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -112,11 +112,11 @@ extern int get_total_size;
 static int blocksize=20;
 static int tarhandle;
 
-static void writetarheader(int f,  const char *aname, SMB_BIG_UINT size, time_t mtime,
+static void writetarheader(int f,  const char *aname, uint64_t size, time_t mtime,
 			   const char *amode, unsigned char ftype);
 static void do_atar(const char *rname_in,char *lname,file_info *finfo1);
 static void do_tar(file_info *finfo, const char *dir);
-static void oct_it(SMB_BIG_UINT value, int ndgs, char *p);
+static void oct_it(uint64_t value, int ndgs, char *p);
 static void fixtarname(char *tptr, const char *fp, size_t l);
 static int dotarbuf(int f, char *b, int n);
 static void dozerobuf(int f, int n);
@@ -154,7 +154,7 @@ static char *string_create_s(int size)
 Write a tar header to buffer
 ****************************************************************************/
 
-static void writetarheader(int f, const char *aname, SMB_BIG_UINT size, time_t mtime,
+static void writetarheader(int f, const char *aname, uint64_t size, time_t mtime,
 			   const char *amode, unsigned char ftype)
 {
 	union hblock hb;
@@ -195,10 +195,10 @@ static void writetarheader(int f, const char *aname, SMB_BIG_UINT size, time_t m
 
 	hb.dbuf.name[NAMSIZ-1]='\0';
 	safe_strcpy(hb.dbuf.mode, amode, sizeof(hb.dbuf.mode)-1);
-	oct_it((SMB_BIG_UINT)0, 8, hb.dbuf.uid);
-	oct_it((SMB_BIG_UINT)0, 8, hb.dbuf.gid);
-	oct_it((SMB_BIG_UINT) size, 13, hb.dbuf.size);
-	if (size > (SMB_BIG_UINT)077777777777LL) {
+	oct_it((uint64_t)0, 8, hb.dbuf.uid);
+	oct_it((uint64_t)0, 8, hb.dbuf.gid);
+	oct_it((uint64_t) size, 13, hb.dbuf.size);
+	if (size > (uint64_t)077777777777LL) {
 		/* This is a non-POSIX compatible extention to store files
 			greater than 8GB. */
 
@@ -207,7 +207,7 @@ static void writetarheader(int f, const char *aname, SMB_BIG_UINT size, time_t m
 		for (i = 8, jp=(char*)&size; i; i--)
 			hb.dbuf.size[i+3] = *(jp++);
 	}
-	oct_it((SMB_BIG_UINT) mtime, 13, hb.dbuf.mtime);
+	oct_it((uint64_t) mtime, 13, hb.dbuf.mtime);
 	memcpy(hb.dbuf.chksum, "        ", sizeof(hb.dbuf.chksum));
 	memset(hb.dbuf.linkname, 0, NAMSIZ);
 	hb.dbuf.linkflag=ftype;
@@ -215,7 +215,7 @@ static void writetarheader(int f, const char *aname, SMB_BIG_UINT size, time_t m
 	for (chk=0, i=sizeof(hb.dummy), jp=hb.dummy; --i>=0;)
 		chk+=(0xFF & *jp++);
 
-	oct_it((SMB_BIG_UINT) chk, 8, hb.dbuf.chksum);
+	oct_it((uint64_t) chk, 8, hb.dbuf.chksum);
 	hb.dbuf.chksum[6] = '\0';
 
 	(void) dotarbuf(f, hb.dummy, sizeof(hb.dummy));
@@ -431,7 +431,7 @@ static void fixtarname(char *tptr, const char *fp, size_t l)
 Convert from decimal to octal string
 ****************************************************************************/
 
-static void oct_it (SMB_BIG_UINT value, int ndgs, char *p)
+static void oct_it (uint64_t value, int ndgs, char *p)
 {
 	/* Converts long to octal string, pads with leading zeros */
 
@@ -567,7 +567,7 @@ static bool ensurepath(const char *fname)
 	return True;
 }
 
-static int padit(char *buf, SMB_BIG_UINT bufsize, SMB_BIG_UINT padsize)
+static int padit(char *buf, uint64_t bufsize, uint64_t padsize)
 {
 	int berr= 0;
 	int bytestowrite;
@@ -607,7 +607,7 @@ append one remote file to the tar file
 static void do_atar(const char *rname_in,char *lname,file_info *finfo1)
 {
 	int fnum = -1;
-	SMB_BIG_UINT nread=0;
+	uint64_t nread=0;
 	char ftype;
 	file_info2 finfo;
 	bool shallitime=True;
@@ -738,7 +738,7 @@ static void do_atar(const char *rname_in,char *lname,file_info *finfo1)
 			if (nread < finfo.size) {
 				DEBUG(0, ("Didn't get entire file. size=%.0f, nread=%d\n",
 							(double)finfo.size, (int)nread));
-				if (padit(data, (SMB_BIG_UINT)sizeof(data), finfo.size - nread))
+				if (padit(data, (uint64_t)sizeof(data), finfo.size - nread))
 					DEBUG(0,("Error writing tar file - %s\n", strerror(errno)));
 			}
 
@@ -992,7 +992,7 @@ static int skip_file(int skipsize)
 static int get_file(file_info2 finfo)
 {
 	int fnum = -1, pos = 0, dsize = 0, bpos = 0;
-	SMB_BIG_UINT rsize = 0;
+	uint64_t rsize = 0;
 
 	DEBUG(5, ("get_file: file: %s, size %.0f\n", finfo.name, (double)finfo.size));
 
diff --git a/source3/include/client.h b/source3/include/client.h
index 70b0421..8d57fe1 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -232,7 +232,7 @@ struct cli_state {
 
 typedef struct file_info {
 	struct cli_state *cli;
-	SMB_BIG_UINT size;
+	uint64_t size;
 	uint16 mode;
 	uid_t uid;
 	gid_t gid;
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 40caf22..85a316b 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -426,7 +426,7 @@ typedef int VOLATILE SIG_ATOMIC_T;
 
 #ifdef LARGE_SMB_DEV_T
 #define SDEV_T_VAL(p, ofs, v) (SIVAL((p),(ofs),(v)&0xFFFFFFFF), SIVAL((p),(ofs)+4,(v)>>32))
-#define DEV_T_VAL(p, ofs) ((SMB_DEV_T)(((SMB_BIG_UINT)(IVAL((p),(ofs))))| (((SMB_BIG_UINT)(IVAL((p),(ofs)+4))) << 32)))
+#define DEV_T_VAL(p, ofs) ((SMB_DEV_T)(((uint64_t)(IVAL((p),(ofs))))| (((uint64_t)(IVAL((p),(ofs)+4))) << 32)))
 #else 
 #define SDEV_T_VAL(p, ofs, v) (SIVAL((p),(ofs),v),SIVAL((p),(ofs)+4,0))
 #define DEV_T_VAL(p, ofs) ((SMB_DEV_T)(IVAL((p),(ofs))))
@@ -452,7 +452,7 @@ typedef int VOLATILE SIG_ATOMIC_T;
 
 #ifdef LARGE_SMB_INO_T
 #define SINO_T_VAL(p, ofs, v) (SIVAL((p),(ofs),(v)&0xFFFFFFFF), SIVAL((p),(ofs)+4,(v)>>32))
-#define INO_T_VAL(p, ofs) ((SMB_INO_T)(((SMB_BIG_UINT)(IVAL(p,ofs)))| (((SMB_BIG_UINT)(IVAL(p,(ofs)+4))) << 32)))
+#define INO_T_VAL(p, ofs) ((SMB_INO_T)(((uint64_t)(IVAL(p,ofs)))| (((uint64_t)(IVAL(p,(ofs)+4))) << 32)))
 #else 
 #define SINO_T_VAL(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0))
 #define INO_T_VAL(p, ofs) ((SMB_INO_T)(IVAL((p),(ofs))))
@@ -466,20 +466,13 @@ typedef int VOLATILE SIG_ATOMIC_T;
 #  endif
 #endif
 
-#if defined(HAVE_LONGLONG)
-#define SMB_BIG_UINT unsigned long long
-#define SMB_BIG_INT long long
 #define SBIG_UINT(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32))
-#else
-#define SMB_BIG_UINT unsigned long
-#define SMB_BIG_INT long
-#define SBIG_UINT(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0))
-#endif
+#define IVAL2_TO_SMB_BIG_UINT(buf,off) ( (((uint64_t)(IVAL((buf),(off)))) & ((uint64_t)0xFFFFFFFF)) | \
+		(( ((uint64_t)(IVAL((buf),(off+4)))) & ((uint64_t)0xFFFFFFFF) ) << 32 ) )
 
-#define SMB_BIG_UINT_BITS (sizeof(SMB_BIG_UINT)*8)
 
 /* this should really be a 64 bit type if possible */
-#define br_off SMB_BIG_UINT
+typedef uint64_t br_off;
 
 #define SMB_OFF_T_BITS (sizeof(SMB_OFF_T)*8)
 
@@ -497,15 +490,11 @@ typedef int VOLATILE SIG_ATOMIC_T;
 #ifdef LARGE_SMB_OFF_T
 #define SOFF_T(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32))
 #define SOFF_T_R(p, ofs, v) (SIVAL(p,(ofs)+4,(v)&0xFFFFFFFF), SIVAL(p,ofs,(v)>>32))
-#define IVAL_TO_SMB_OFF_T(buf,off) ((SMB_OFF_T)(( ((SMB_BIG_UINT)(IVAL((buf),(off)))) & ((SMB_BIG_UINT)0xFFFFFFFF) )))
-#define IVAL2_TO_SMB_BIG_UINT(buf,off) ( (((SMB_BIG_UINT)(IVAL((buf),(off)))) & ((SMB_BIG_UINT)0xFFFFFFFF)) | \
-		(( ((SMB_BIG_UINT)(IVAL((buf),(off+4)))) & ((SMB_BIG_UINT)0xFFFFFFFF) ) << 32 ) )
+#define IVAL_TO_SMB_OFF_T(buf,off) ((SMB_OFF_T)(( ((uint64_t)(IVAL((buf),(off)))) & ((uint64_t)0xFFFFFFFF) )))
 #else 
 #define SOFF_T(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0))
 #define SOFF_T_R(p, ofs, v) (SIVAL(p,(ofs)+4,v),SIVAL(p,ofs,0))
 #define IVAL_TO_SMB_OFF_T(buf,off) ((SMB_OFF_T)(( ((uint32)(IVAL((buf),(off)))) & 0xFFFFFFFF )))
-#define IVAL2_TO_SMB_BIG_UINT(buf,off) ( (((SMB_BIG_UINT)(IVAL((buf),(off)))) & ((SMB_BIG_UINT)0xFFFFFFFF)) | \
-		                (( ((SMB_BIG_UINT)(IVAL((buf),(off+4)))) & ((SMB_BIG_UINT)0xFFFFFFFF) ) << 32 ) )
 #endif
 
 /*
diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h
index a7d46e7..496d87e 100644
--- a/source3/include/nameserv.h
+++ b/source3/include/nameserv.h
@@ -208,7 +208,7 @@ struct nmb_data {
 	time_t death_time; /* The time the record must be removed (do not remove if 0). */
 	time_t refresh_time; /* The time the record should be refreshed. */
   
-	SMB_BIG_UINT id;		/* unique id */
+	uint64_t id;		/* unique id */
 	struct in_addr wins_ip;	/* the adress of the wins server this record comes from */
 
 	int wins_flags;		/* similar to the netbios flags but different ! */
@@ -606,7 +606,7 @@ typedef struct _WINS_RECORD {
 	char type;
 	int nb_flags;
 	int wins_flags;
-	SMB_BIG_UINT id;
+	uint64_t id;
 	int num_ips;
 	struct in_addr ip[25];
 	struct in_addr wins_ip;
diff --git a/source3/include/ntquotas.h b/source3/include/ntquotas.h
index ed503b3..9aa8b91 100644
--- a/source3/include/ntquotas.h
+++ b/source3/include/ntquotas.h
@@ -47,16 +47,16 @@
 #define QUOTAS_4000		0x4000
 #define QUOTAS_8000		0x8000
 
-#define SMB_NTQUOTAS_NO_LIMIT	((SMB_BIG_UINT)(-1))
-#define SMB_NTQUOTAS_NO_ENTRY	((SMB_BIG_UINT)(-2))
-#define SMB_NTQUOTAS_NO_SPACE	((SMB_BIG_UINT)(0))
-#define SMB_NTQUOTAS_1_B	(SMB_BIG_UINT)0x0000000000000001
-#define SMB_NTQUOTAS_1KB	(SMB_BIG_UINT)0x0000000000000400
-#define SMB_NTQUOTAS_1MB	(SMB_BIG_UINT)0x0000000000100000
-#define SMB_NTQUOTAS_1GB	(SMB_BIG_UINT)0x0000000040000000
-#define SMB_NTQUOTAS_1TB	(SMB_BIG_UINT)0x0000010000000000
-#define SMB_NTQUOTAS_1PB	(SMB_BIG_UINT)0x0004000000000000
-#define SMB_NTQUOTAS_1EB	(SMB_BIG_UINT)0x1000000000000000
+#define SMB_NTQUOTAS_NO_LIMIT	((uint64_t)(-1))
+#define SMB_NTQUOTAS_NO_ENTRY	((uint64_t)(-2))
+#define SMB_NTQUOTAS_NO_SPACE	((uint64_t)(0))
+#define SMB_NTQUOTAS_1_B	(uint64_t)0x0000000000000001
+#define SMB_NTQUOTAS_1KB	(uint64_t)0x0000000000000400
+#define SMB_NTQUOTAS_1MB	(uint64_t)0x0000000000100000
+#define SMB_NTQUOTAS_1GB	(uint64_t)0x0000000040000000
+#define SMB_NTQUOTAS_1TB	(uint64_t)0x0000010000000000
+#define SMB_NTQUOTAS_1PB	(uint64_t)0x0004000000000000
+#define SMB_NTQUOTAS_1EB	(uint64_t)0x1000000000000000
 
 enum SMB_QUOTA_TYPE {
 	SMB_INVALID_QUOTA_TYPE = -1,
@@ -68,9 +68,9 @@ enum SMB_QUOTA_TYPE {
 
 typedef struct _SMB_NTQUOTA_STRUCT {
 	enum SMB_QUOTA_TYPE qtype;
-	SMB_BIG_UINT usedspace;
-	SMB_BIG_UINT softlim;
-	SMB_BIG_UINT hardlim;
+	uint64_t usedspace;
+	uint64_t softlim;
+	uint64_t hardlim;
 	uint32 qflags;
 	DOM_SID sid;
 } SMB_NTQUOTA_STRUCT;
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 40b89a1..8ccf987 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -557,7 +557,7 @@ void pull_file_id_16(char *buf, struct file_id *id);
 
 /* The following definitions come from lib/fsusage.c  */
 
-int sys_fsusage(const char *path, SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize);
+int sys_fsusage(const char *path, uint64_t *dfree, uint64_t *dsize);
 
 /* The following definitions come from lib/gencache.c  */
 
@@ -1676,7 +1676,7 @@ void rfc1738_unescape(char *buf);
 DATA_BLOB base64_decode_data_blob(const char *s);
 void base64_decode_inplace(char *s);
 char *base64_encode_data_blob(TALLOC_CTX *mem_ctx, DATA_BLOB data);
-SMB_BIG_UINT STR_TO_SMB_BIG_UINT(const char *nptr, const char **entptr);
+uint64_t STR_TO_SMB_BIG_UINT(const char *nptr, const char **entptr);
 SMB_OFF_T conv_str_size(const char * str);
 void string_append(char **left, const char *right);
 bool add_string_to_array(TALLOC_CTX *mem_ctx,
@@ -4248,13 +4248,13 @@ bool cli_lock(struct cli_state *cli, int fnum,
 	      uint32 offset, uint32 len, int timeout, enum brl_type lock_type);
 bool cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len);
 bool cli_lock64(struct cli_state *cli, int fnum,
-		SMB_BIG_UINT offset, SMB_BIG_UINT len, int timeout, enum brl_type lock_type);
-bool cli_unlock64(struct cli_state *cli, int fnum, SMB_BIG_UINT offset, SMB_BIG_UINT len);
+		uint64_t offset, uint64_t len, int timeout, enum brl_type lock_type);
+bool cli_unlock64(struct cli_state *cli, int fnum, uint64_t offset, uint64_t len);
 bool cli_posix_lock(struct cli_state *cli, int fnum,
-			SMB_BIG_UINT offset, SMB_BIG_UINT len,
+			uint64_t offset, uint64_t len,
 			bool wait_lock, enum brl_type lock_type);
-bool cli_posix_unlock(struct cli_state *cli, int fnum, SMB_BIG_UINT offset, SMB_BIG_UINT len);
-bool cli_posix_getlock(struct cli_state *cli, int fnum, SMB_BIG_UINT *poffset, SMB_BIG_UINT *plen);
+bool cli_posix_unlock(struct cli_state *cli, int fnum, uint64_t offset, uint64_t len);
+bool cli_posix_getlock(struct cli_state *cli, int fnum, uint64_t *poffset, uint64_t *plen);
 bool cli_getattrE(struct cli_state *cli, int fd,
 		  uint16 *attr, SMB_OFF_T *size,
 		  time_t *change_time,
@@ -5106,20 +5106,20 @@ const char *lock_type_name(enum brl_type lock_type);
 const char *lock_flav_name(enum brl_flavour lock_flav);
 bool is_locked(files_struct *fsp,
 		uint32 smbpid,
-		SMB_BIG_UINT count,
-		SMB_BIG_UINT offset, 
+		uint64_t count,
+		uint64_t offset, 
 		enum brl_type lock_type);
 NTSTATUS query_lock(files_struct *fsp,
 			uint32 *psmbpid,
-			SMB_BIG_UINT *pcount,
-			SMB_BIG_UINT *poffset,
+			uint64_t *pcount,
+			uint64_t *poffset,
 			enum brl_type *plock_type,
 			enum brl_flavour lock_flav);
 struct byte_range_lock *do_lock(struct messaging_context *msg_ctx,
 			files_struct *fsp,
 			uint32 lock_pid,
-			SMB_BIG_UINT count,
-			SMB_BIG_UINT offset,
+			uint64_t count,
+			uint64_t offset,
 			enum brl_type lock_type,
 			enum brl_flavour lock_flav,
 			bool blocking_lock,
@@ -5128,13 +5128,13 @@ struct byte_range_lock *do_lock(struct messaging_context *msg_ctx,
 NTSTATUS do_unlock(struct messaging_context *msg_ctx,
 			files_struct *fsp,
 			uint32 lock_pid,
-			SMB_BIG_UINT count,
-			SMB_BIG_UINT offset,
+			uint64_t count,
+			uint64_t offset,
 			enum brl_flavour lock_flav);
 NTSTATUS do_lock_cancel(files_struct *fsp,
 			uint32 lock_pid,
-			SMB_BIG_UINT count,
-			SMB_BIG_UINT offset,
+			uint64_t count,
+			uint64_t offset,
 			enum brl_flavour lock_flav);
 void locking_close_file(struct messaging_context *msg_ctx,
 			files_struct *fsp);
@@ -5186,8 +5186,8 @@ int share_mode_forall(void (*fn)(const struct share_mode_entry *, const char *,
 /* The following definitions come from locking/posix.c  */
 
 bool is_posix_locked(files_struct *fsp,
-			SMB_BIG_UINT *pu_offset,
-			SMB_BIG_UINT *pu_count,
+			uint64_t *pu_offset,
+			uint64_t *pu_count,
 			enum brl_type *plock_type,
 			enum brl_flavour lock_flav);
 bool posix_locking_init(bool read_only);
@@ -5195,28 +5195,28 @@ bool posix_locking_end(void);
 void reduce_windows_lock_ref_count(files_struct *fsp, unsigned int dcount);
 int fd_close_posix(struct files_struct *fsp);
 bool set_posix_lock_windows_flavour(files_struct *fsp,
-			SMB_BIG_UINT u_offset,
-			SMB_BIG_UINT u_count,
+			uint64_t u_offset,
+			uint64_t u_count,
 			enum brl_type lock_type,
 			const struct lock_context *lock_ctx,
 			const struct lock_struct *plocks,
 			int num_locks,
 			int *errno_ret);
 bool release_posix_lock_windows_flavour(files_struct *fsp,
-				SMB_BIG_UINT u_offset,
-				SMB_BIG_UINT u_count,
+				uint64_t u_offset,
+				uint64_t u_count,
 				enum brl_type deleted_lock_type,
 				const struct lock_context *lock_ctx,
 				const struct lock_struct *plocks,
 				int num_locks);
 bool set_posix_lock_posix_flavour(files_struct *fsp,
-			SMB_BIG_UINT u_offset,
-			SMB_BIG_UINT u_count,
+			uint64_t u_offset,
+			uint64_t u_count,
 			enum brl_type lock_type,
 			int *errno_ret);
 bool release_posix_lock_posix_flavour(files_struct *fsp,
-				SMB_BIG_UINT u_offset,
-				SMB_BIG_UINT u_count,
+				uint64_t u_offset,
+				uint64_t u_count,
 				const struct lock_context *lock_ctx,
 				const struct lock_struct *plocks,
 				int num_locks);
@@ -9322,16 +9322,16 @@ bool push_blocking_lock_request( struct byte_range_lock *br_lck,
 		uint32 lock_pid,
 		enum brl_type lock_type,
 		enum brl_flavour lock_flav,
-		SMB_BIG_UINT offset,
-		SMB_BIG_UINT count,
+		uint64_t offset,
+		uint64_t count,
 		uint32 blocking_pid);
 void cancel_pending_lock_requests_by_fid(files_struct *fsp, struct byte_range_lock *br_lck);
 void remove_pending_lock_requests_by_mid(int mid);
 bool blocking_lock_was_deferred(int mid);
 bool blocking_lock_cancel(files_struct *fsp,
 			uint32 lock_pid,
-			SMB_BIG_UINT offset,
-			SMB_BIG_UINT count,
+			uint64_t offset,
+			uint64_t count,
 			enum brl_flavour lock_flav,
 			unsigned char locktype,
                         NTSTATUS err);
@@ -9397,14 +9397,14 @@ bool register_message_flags(bool doreg, uint32 msg_flags);
 
 /* The following definitions come from smbd/dfree.c  */
 
-SMB_BIG_UINT sys_disk_free(connection_struct *conn, const char *path, bool small_query, 
-                              SMB_BIG_UINT *bsize,SMB_BIG_UINT *dfree,SMB_BIG_UINT *dsize);
-SMB_BIG_UINT get_dfree_info(connection_struct *conn,
+uint64_t sys_disk_free(connection_struct *conn, const char *path, bool small_query, 
+                              uint64_t *bsize,uint64_t *dfree,uint64_t *dsize);
+uint64_t get_dfree_info(connection_struct *conn,
 			const char *path,
 			bool small_query,
-			SMB_BIG_UINT *bsize,
-			SMB_BIG_UINT *dfree,
-			SMB_BIG_UINT *dsize);
+			uint64_t *bsize,
+			uint64_t *dfree,
+			uint64_t *dsize);
 
 /* The following definitions come from smbd/dir.c  */
 
@@ -9806,7 +9806,7 @@ NTSTATUS create_file_unixpath(connection_struct *conn,
 			      uint32_t create_options,
 			      uint32_t file_attributes,
 			      uint32_t oplock_request,
-			      SMB_BIG_UINT allocation_size,
+			      uint64_t allocation_size,
 			      struct security_descriptor *sd,
 			      struct ea_list *ea_list,
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list