[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Thu Apr 5 17:48:04 MDT 2012
The branch, master has been updated
via 6aa12fc build: Remove SMB_OFF_T, replace with off_t
from 4816646 s3-build: Remove unused configure checks for xattr functions
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6aa12fcb30c8f7246fd0215b1d808191c0d87668
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Apr 5 14:53:08 2012 +1000
build: Remove SMB_OFF_T, replace with off_t
Now that we always require a 64 bit off_t, we no longer need SMB_OFF_T.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Fri Apr 6 01:47:43 CEST 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
examples/VFS/skel_opaque.c | 20 ++++----
examples/VFS/skel_transparent.c | 20 ++++----
source3/client/client.c | 10 ++--
source3/client/clitar.c | 2 +-
source3/include/includes.h | 8 +---
source3/include/libsmb_internal.h | 6 +-
source3/include/printing.h | 2 +-
source3/include/proto.h | 20 ++++----
source3/include/smb.h | 10 ++--
source3/include/transfer_file.h | 2 +-
source3/include/vfs.h | 47 ++++++++++----------
source3/lib/recvfile.c | 8 ++--
source3/lib/sendfile.c | 18 ++++----
source3/lib/system.c | 10 ++--
source3/lib/util.c | 6 +-
source3/lib/util_transfer_file.c | 4 +-
source3/libsmb/clifile.c | 16 ++++----
source3/libsmb/clirap.c | 10 ++--
source3/libsmb/clirap.h | 10 ++--
source3/libsmb/clireadwrite.c | 20 ++++----
source3/libsmb/libsmb_dir.c | 2 +-
source3/libsmb/libsmb_file.c | 8 ++--
source3/libsmb/libsmb_stat.c | 6 +-
source3/libsmb/libsmb_xattr.c | 6 +-
source3/libsmb/proto.h | 16 ++++----
source3/locking/posix.c | 64 ++++++++++++++--------------
source3/modules/onefs.h | 4 +-
source3/modules/onefs_streams.c | 4 +-
source3/modules/onefs_system.c | 8 ++--
source3/modules/vfs_aio_fork.c | 2 +-
source3/modules/vfs_cacheprime.c | 12 +++---
source3/modules/vfs_commit.c | 14 +++---
source3/modules/vfs_crossrename.c | 4 +-
source3/modules/vfs_default.c | 30 +++++++-------
source3/modules/vfs_full_audit.c | 22 +++++-----
source3/modules/vfs_gpfs.c | 6 +-
source3/modules/vfs_gpfs_hsm_notify.c | 4 +-
source3/modules/vfs_onefs.c | 4 +-
source3/modules/vfs_prealloc.c | 10 ++--
source3/modules/vfs_readahead.c | 8 ++--
source3/modules/vfs_recycle.c | 20 ++++----
source3/modules/vfs_smb_traffic_analyzer.c | 8 ++--
source3/modules/vfs_streams_depot.c | 4 +-
source3/modules/vfs_streams_xattr.c | 14 +++---
source3/modules/vfs_time_audit.c | 24 +++++-----
source3/modules/vfs_tsmsm.c | 6 +-
source3/passdb/pdb_smbpasswd.c | 4 +-
source3/printing/nt_printing.c | 6 +-
source3/printing/printspoolss.c | 2 +-
source3/smbd/aio.c | 12 +++---
source3/smbd/close.c | 2 +-
source3/smbd/dir.c | 4 +-
source3/smbd/fileio.c | 14 +++---
source3/smbd/nttrans.c | 8 ++--
source3/smbd/proto.h | 30 +++++++-------
source3/smbd/reply.c | 58 +++++++++++++-------------
source3/smbd/smb2_read.c | 2 +-
source3/smbd/trans2.c | 12 +++---
source3/smbd/vfs.c | 38 ++++++++--------
source3/torture/cmd_vfs.c | 6 +-
source3/torture/test_posix_append.c | 2 +-
source3/torture/torture.c | 10 ++--
source3/torture/utable.c | 2 +-
63 files changed, 384 insertions(+), 387 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 40691ed..1a44a39 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -183,7 +183,7 @@ static ssize_t skel_vfs_read(vfs_handle_struct *handle, files_struct *fsp, void
return -1;
}
-static ssize_t skel_pread(vfs_handle_struct *handle, files_struct *fsp, void *data, size_t n, SMB_OFF_T offset)
+static ssize_t skel_pread(vfs_handle_struct *handle, files_struct *fsp, void *data, size_t n, off_t offset)
{
errno = ENOSYS;
return -1;
@@ -195,25 +195,25 @@ static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, const vo
return -1;
}
-static ssize_t skel_pwrite(vfs_handle_struct *handle, files_struct *fsp, const void *data, size_t n, SMB_OFF_T offset)
+static ssize_t skel_pwrite(vfs_handle_struct *handle, files_struct *fsp, const void *data, size_t n, off_t offset)
{
errno = ENOSYS;
return -1;
}
-static SMB_OFF_T skel_lseek(vfs_handle_struct *handle, files_struct *fsp, SMB_OFF_T offset, int whence)
+static off_t skel_lseek(vfs_handle_struct *handle, files_struct *fsp, off_t offset, int whence)
{
errno = ENOSYS;
- return (SMB_OFF_T)-1;
+ return (off_t)-1;
}
-static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct *fromfsp, const DATA_BLOB *hdr, SMB_OFF_T offset, size_t n)
+static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct *fromfsp, const DATA_BLOB *hdr, off_t offset, size_t n)
{
errno = ENOSYS;
return -1;
}
-static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, files_struct *tofsp, SMB_OFF_T offset, size_t n)
+static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, files_struct *tofsp, off_t offset, size_t n)
{
errno = ENOSYS;
return -1;
@@ -314,7 +314,7 @@ static int skel_ntimes(vfs_handle_struct *handle,
return -1;
}
-static int skel_ftruncate(vfs_handle_struct *handle, files_struct *fsp, SMB_OFF_T offset)
+static int skel_ftruncate(vfs_handle_struct *handle, files_struct *fsp, off_t offset)
{
errno = ENOSYS;
return -1;
@@ -322,13 +322,13 @@ static int skel_ftruncate(vfs_handle_struct *handle, files_struct *fsp, SMB_OFF_
static int skel_fallocate(vfs_handle_struct *handle, files_struct *fsp,
enum vfs_fallocate_mode mode,
- SMB_OFF_T offset, SMB_OFF_T len)
+ off_t offset, off_t len)
{
errno = ENOSYS;
return -1;
}
-static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
+static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op, off_t offset, off_t count, int type)
{
errno = ENOSYS;
return false;
@@ -346,7 +346,7 @@ static int skel_linux_setlease(struct vfs_handle_struct *handle, struct files_st
return -1;
}
-static bool skel_getlock(vfs_handle_struct *handle, files_struct *fsp, SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid)
+static bool skel_getlock(vfs_handle_struct *handle, files_struct *fsp, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid)
{
errno = ENOSYS;
return false;
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 2d5fcdd..ba7e898 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -189,7 +189,7 @@ static ssize_t skel_vfs_read(vfs_handle_struct *handle, files_struct *fsp, void
return SMB_VFS_NEXT_READ(handle, fsp, data, n);
}
-static ssize_t skel_pread(vfs_handle_struct *handle, files_struct *fsp, void *data, size_t n, SMB_OFF_T offset)
+static ssize_t skel_pread(vfs_handle_struct *handle, files_struct *fsp, void *data, size_t n, off_t offset)
{
return SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);
}
@@ -199,22 +199,22 @@ static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, const vo
return SMB_VFS_NEXT_WRITE(handle, fsp, data, n);
}
-static ssize_t skel_pwrite(vfs_handle_struct *handle, files_struct *fsp, const void *data, size_t n, SMB_OFF_T offset)
+static ssize_t skel_pwrite(vfs_handle_struct *handle, files_struct *fsp, const void *data, size_t n, off_t offset)
{
return SMB_VFS_NEXT_PWRITE(handle, fsp, data, n, offset);
}
-static SMB_OFF_T skel_lseek(vfs_handle_struct *handle, files_struct *fsp, SMB_OFF_T offset, int whence)
+static off_t skel_lseek(vfs_handle_struct *handle, files_struct *fsp, off_t offset, int whence)
{
return SMB_VFS_NEXT_LSEEK(handle, fsp, offset, whence);
}
-static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct *fromfsp, const DATA_BLOB *hdr, SMB_OFF_T offset, size_t n)
+static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct *fromfsp, const DATA_BLOB *hdr, off_t offset, size_t n)
{
return SMB_VFS_NEXT_SENDFILE(handle, tofd, fromfsp, hdr, offset, n);
}
-static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, files_struct *tofsp, SMB_OFF_T offset, size_t n)
+static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, files_struct *tofsp, off_t offset, size_t n)
{
return SMB_VFS_NEXT_RECVFILE(handle, fromfd, tofsp, offset, n);
}
@@ -299,20 +299,20 @@ static int skel_ntimes(vfs_handle_struct *handle,
return SMB_VFS_NEXT_NTIMES(handle, smb_fname, ft);
}
-static int skel_ftruncate(vfs_handle_struct *handle, files_struct *fsp, SMB_OFF_T offset)
+static int skel_ftruncate(vfs_handle_struct *handle, files_struct *fsp, off_t offset)
{
return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, offset);
}
static int skel_fallocate(vfs_handle_struct *handle, files_struct *fsp,
enum vfs_fallocate_mode mode,
- SMB_OFF_T offset,
- SMB_OFF_T len)
+ off_t offset,
+ off_t len)
{
return SMB_VFS_NEXT_FALLOCATE(handle, fsp, mode, offset, len);
}
-static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
+static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op, off_t offset, off_t count, int type)
{
return SMB_VFS_NEXT_LOCK(handle, fsp, op, offset, count, type);
}
@@ -327,7 +327,7 @@ static int skel_linux_setlease(struct vfs_handle_struct *handle, struct files_st
return SMB_VFS_NEXT_LINUX_SETLEASE(handle, fsp, leasetype);
}
-static bool skel_getlock(vfs_handle_struct *handle, files_struct *fsp, SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid)
+static bool skel_getlock(vfs_handle_struct *handle, files_struct *fsp, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid)
{
return SMB_VFS_NEXT_GETLOCK(handle, fsp, poffset, pcount, ptype, ppid);
}
diff --git a/source3/client/client.c b/source3/client/client.c
index 3bfe8e9..a4a7ebd 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -251,7 +251,7 @@ static int readfile(uint8_t *b, int n, XFILE *f)
struct push_state {
XFILE *f;
- SMB_OFF_T nread;
+ off_t nread;
};
static size_t push_source(uint8_t *buf, size_t n, void *priv)
@@ -1070,9 +1070,9 @@ static int do_get(const char *rname, const char *lname_in, bool reget)
bool newhandle = false;
struct timespec tp_start;
uint16 attr;
- SMB_OFF_T size;
+ off_t size;
off_t start = 0;
- SMB_OFF_T nread = 0;
+ off_t nread = 0;
int rc = 0;
struct cli_state *targetcli = NULL;
char *targetname = NULL;
@@ -1678,7 +1678,7 @@ static int do_allinfo(const char *name)
{
fstring altname;
struct timespec b_time, a_time, m_time, c_time;
- SMB_OFF_T size;
+ off_t size;
uint16_t mode;
SMB_INO_T ino;
NTTIME tmp;
@@ -1838,7 +1838,7 @@ static int do_put(const char *rname, const char *lname, bool reput)
TALLOC_CTX *ctx = talloc_tos();
uint16_t fnum;
XFILE *f;
- SMB_OFF_T start = 0;
+ off_t start = 0;
int rc = 0;
struct timespec tp_start;
struct cli_state *targetcli;
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 43311c1..b02ada4 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -45,7 +45,7 @@ static int clipfind(char **aret, int ret, char *tok);
typedef struct file_info_struct file_info2;
struct file_info_struct {
- SMB_OFF_T size;
+ off_t size;
uint16 mode;
uid_t uid;
gid_t gid;
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 8e5b1cd..7bdd200 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -298,10 +298,6 @@ typedef sig_atomic_t volatile SIG_ATOMIC_T;
#define INO_T_VAL(p, ofs) ((SMB_INO_T)(IVAL((p),(ofs))))
#endif
-#ifndef SMB_OFF_T
-# define SMB_OFF_T off_t
-#endif
-
/* TODO: remove this macros */
#define SBIG_UINT(p, ofs, v) SBVAL(p, ofs, v)
#define BIG_UINT(p, ofs) BVAL(p, ofs)
@@ -310,7 +306,7 @@ typedef sig_atomic_t volatile SIG_ATOMIC_T;
/* this should really be a 64 bit type if possible */
typedef uint64_t br_off;
-#define SMB_OFF_T_BITS (sizeof(SMB_OFF_T)*8)
+#define SMB_OFF_T_BITS (sizeof(off_t)*8)
/*
* Set the define that tells us if we can do 64 bit
@@ -319,7 +315,7 @@ typedef uint64_t br_off;
#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)(( ((uint64_t)(IVAL((buf),(off)))) & ((uint64_t)0xFFFFFFFF) )))
+#define IVAL_TO_SMB_OFF_T(buf,off) ((off_t)(( ((uint64_t)(IVAL((buf),(off)))) & ((uint64_t)0xFFFFFFFF) )))
#ifndef HAVE_BLKSIZE_T
/* This is mainly for HP/UX which defines st_blksize as long */
diff --git a/source3/include/libsmb_internal.h b/source3/include/libsmb_internal.h
index 7f16ab6..0c8d8ab 100644
--- a/source3/include/libsmb_internal.h
+++ b/source3/include/libsmb_internal.h
@@ -40,7 +40,7 @@
*/
typedef struct DOS_ATTR_DESC {
int mode;
- SMB_OFF_T size;
+ off_t size;
time_t create_time;
time_t access_time;
time_t write_time;
@@ -96,7 +96,7 @@ struct smbc_dir_list {
struct _SMBCFILE {
int cli_fd;
char *fname;
- SMB_OFF_T offset;
+ off_t offset;
struct _SMBCSRV *srv;
bool file;
struct smbc_dir_list *dir_list, *dir_end, *dir_next;
@@ -368,7 +368,7 @@ SMBC_getatr(SMBCCTX * context,
SMBCSRV *srv,
const char *path,
uint16 *mode,
- SMB_OFF_T *size,
+ off_t *size,
struct timespec *create_time_ts,
struct timespec *access_time_ts,
struct timespec *write_time_ts,
diff --git a/source3/include/printing.h b/source3/include/printing.h
index debf63f..3551d8e 100644
--- a/source3/include/printing.h
+++ b/source3/include/printing.h
@@ -179,7 +179,7 @@ NTSTATUS print_spool_open(files_struct *fsp,
uint16_t current_vuid);
int print_spool_write(files_struct *fsp, const char *data, uint32_t size,
- SMB_OFF_T offset, uint32_t *written);
+ off_t offset, uint32_t *written);
void print_spool_end(files_struct *fsp, enum file_close_type close_type);
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1d3dba6..34c9fe8 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -192,17 +192,17 @@ void pidfile_unlink(void);
ssize_t sys_recvfile(int fromfd,
int tofd,
- SMB_OFF_T offset,
+ off_t offset,
size_t count);
ssize_t sys_recvfile(int fromfd,
int tofd,
- SMB_OFF_T offset,
+ off_t offset,
size_t count);
ssize_t drain_socket(int sockfd, size_t count);
/* The following definitions come from lib/sendfile.c */
-ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T offset, size_t count);
+ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, off_t offset, size_t count);
/* The following definitions come from lib/server_mutex.c */
@@ -321,8 +321,8 @@ int sys_set_nfs_quota(const char *path, const char *bdev,
ssize_t sys_read(int fd, void *buf, size_t count);
ssize_t sys_write(int fd, const void *buf, size_t count);
ssize_t sys_writev(int fd, const struct iovec *iov, int iovcnt);
-ssize_t sys_pread(int fd, void *buf, size_t count, SMB_OFF_T off);
-ssize_t sys_pwrite(int fd, const void *buf, size_t count, SMB_OFF_T off);
+ssize_t sys_pread(int fd, void *buf, size_t count, off_t off);
+ssize_t sys_pwrite(int fd, const void *buf, size_t count, off_t off);
ssize_t sys_send(int s, const void *msg, size_t len, int flags);
ssize_t sys_recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen);
int sys_fcntl_ptr(int fd, int cmd, void *arg);
@@ -334,8 +334,8 @@ int sys_fstat(int fd, SMB_STRUCT_STAT *sbuf,
bool fake_dir_create_times);
int sys_lstat(const char *fname,SMB_STRUCT_STAT *sbuf,
bool fake_dir_create_times);
-int sys_posix_fallocate(int fd, SMB_OFF_T offset, SMB_OFF_T len);
-int sys_fallocate(int fd, enum vfs_fallocate_mode mode, SMB_OFF_T offset, SMB_OFF_T len);
+int sys_posix_fallocate(int fd, off_t offset, off_t len);
+int sys_fallocate(int fd, enum vfs_fallocate_mode mode, off_t offset, off_t len);
void kernel_flock(int fd, uint32 share_mode, uint32 access_mask);
DIR *sys_fdopendir(int fd);
int sys_mknod(const char *path, mode_t mode, SMB_DEV_T dev);
@@ -458,7 +458,7 @@ int set_message_bcc(char *buf,int num_bytes);
ssize_t message_push_blob(uint8 **outbuf, DATA_BLOB blob);
char *unix_clean_name(TALLOC_CTX *ctx, const char *s);
char *clean_name(TALLOC_CTX *ctx, const char *s);
-ssize_t write_data_at_offset(int fd, const char *buffer, size_t N, SMB_OFF_T pos);
+ssize_t write_data_at_offset(int fd, const char *buffer, size_t N, off_t pos);
int set_blocking(int fd, bool set);
NTSTATUS init_before_fork(void);
NTSTATUS reinit_after_fork(struct messaging_context *msg_ctx,
@@ -487,8 +487,8 @@ const char *readdirname(DIR *p);
bool is_in_path(const char *name, name_compare_entry *namelist, bool case_sensitive);
void set_namearray(name_compare_entry **ppname_array, const char *namelist);
void free_namearray(name_compare_entry *name_array);
-bool fcntl_lock(int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type);
-bool fcntl_getlock(int fd, SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid);
+bool fcntl_lock(int fd, int op, off_t offset, off_t count, int type);
+bool fcntl_getlock(int fd, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid);
bool is_myname(const char *s);
void ra_lanman_string( const char *native_lanman );
const char *get_remote_arch_str(void);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index ddf3227..758ad99 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -128,8 +128,8 @@ typedef union unid_t {
#include "librpc/gen_ndr/security.h"
typedef struct write_cache {
- SMB_OFF_T file_size;
- SMB_OFF_T offset;
+ off_t file_size;
+ off_t offset;
size_t alloc_size;
size_t data_size;
char *data;
@@ -139,7 +139,7 @@ struct fd_handle {
size_t ref_count;
int fd;
uint64_t position_information;
- SMB_OFF_T pos;
+ off_t pos;
uint32 private_options; /* NT Create options, but we only look at
* NTCREATEX_OPTIONS_PRIVATE_DENY_DOS and
* NTCREATEX_OPTIONS_PRIVATE_DENY_FCB and
@@ -340,8 +340,8 @@ struct trans_state {
*/
struct stream_struct {
- SMB_OFF_T size;
- SMB_OFF_T alloc_size;
+ off_t size;
+ off_t alloc_size;
char *name;
};
diff --git a/source3/include/transfer_file.h b/source3/include/transfer_file.h
index 79ad9c4..546104f 100644
--- a/source3/include/transfer_file.h
+++ b/source3/include/transfer_file.h
@@ -27,6 +27,6 @@ ssize_t transfer_file_internal(void *in_file,
ssize_t (*read_fn)(void *, void *, size_t),
ssize_t (*write_fn)(void *, const void *, size_t));
-SMB_OFF_T transfer_file(int infd, int outfd, SMB_OFF_T n);
+off_t transfer_file(int infd, int outfd, off_t n);
#endif /* __TRANSFER_FILE_H__ */
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 48b0973..e858235 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -139,6 +139,7 @@
/* Leave at 29 - not yet releases. Add fsctl. Richard Sharpe */
/* Leave at 29 - not yet released. add SMB_VFS_GET_DFS_REFERRAL() - metze */
/* Leave at 29 - not yet released. Remove l{list,get,set,remove}xattr - abartlet */
+/* Leave at 29 - not yet released. move to plain off_t - abartlet */
#define SMB_VFS_INTERFACE_VERSION 29
/*
@@ -241,12 +242,12 @@ struct vfs_fn_pointers {
int *pinfo);
int (*close_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp);
ssize_t (*read_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, void *data, size_t n);
- ssize_t (*pread_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, void *data, size_t n, SMB_OFF_T offset);
+ ssize_t (*pread_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, void *data, size_t n, off_t offset);
ssize_t (*write_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const void *data, size_t n);
- ssize_t (*pwrite_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const void *data, size_t n, SMB_OFF_T offset);
- SMB_OFF_T (*lseek_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_OFF_T offset, int whence);
- ssize_t (*sendfile_fn)(struct vfs_handle_struct *handle, int tofd, files_struct *fromfsp, const DATA_BLOB *header, SMB_OFF_T offset, size_t count);
- ssize_t (*recvfile_fn)(struct vfs_handle_struct *handle, int fromfd, files_struct *tofsp, SMB_OFF_T offset, size_t count);
+ ssize_t (*pwrite_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const void *data, size_t n, off_t offset);
+ off_t (*lseek_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, off_t offset, int whence);
+ ssize_t (*sendfile_fn)(struct vfs_handle_struct *handle, int tofd, files_struct *fromfsp, const DATA_BLOB *header, off_t offset, size_t count);
+ ssize_t (*recvfile_fn)(struct vfs_handle_struct *handle, int fromfd, files_struct *tofsp, off_t offset, size_t count);
int (*rename_fn)(struct vfs_handle_struct *handle,
const struct smb_filename *smb_fname_src,
const struct smb_filename *smb_fname_dst);
@@ -267,17 +268,17 @@ struct vfs_fn_pointers {
int (*ntimes_fn)(struct vfs_handle_struct *handle,
const struct smb_filename *smb_fname,
struct smb_file_time *ft);
- int (*ftruncate_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_OFF_T offset);
+ int (*ftruncate_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, off_t offset);
int (*fallocate_fn)(struct vfs_handle_struct *handle,
struct files_struct *fsp,
enum vfs_fallocate_mode mode,
- SMB_OFF_T offset,
- SMB_OFF_T len);
- bool (*lock_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, int op, SMB_OFF_T offset, SMB_OFF_T count, int type);
+ off_t offset,
+ off_t len);
+ bool (*lock_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, int op, off_t offset, off_t count, int type);
int (*kernel_flock_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp,
uint32 share_mode, uint32_t access_mask);
int (*linux_setlease_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, int leasetype);
- bool (*getlock_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid);
+ bool (*getlock_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid);
int (*symlink_fn)(struct vfs_handle_struct *handle, const char *oldpath, const char *newpath);
int (*readlink_fn)(struct vfs_handle_struct *handle, const char *path, char *buf, size_t bufsiz);
int (*link_fn)(struct vfs_handle_struct *handle, const char *oldpath, const char *newpath);
@@ -598,21 +599,21 @@ ssize_t smb_vfs_call_read(struct vfs_handle_struct *handle,
struct files_struct *fsp, void *data, size_t n);
ssize_t smb_vfs_call_pread(struct vfs_handle_struct *handle,
struct files_struct *fsp, void *data, size_t n,
- SMB_OFF_T offset);
+ off_t offset);
ssize_t smb_vfs_call_write(struct vfs_handle_struct *handle,
struct files_struct *fsp, const void *data,
size_t n);
ssize_t smb_vfs_call_pwrite(struct vfs_handle_struct *handle,
struct files_struct *fsp, const void *data,
- size_t n, SMB_OFF_T offset);
-SMB_OFF_T smb_vfs_call_lseek(struct vfs_handle_struct *handle,
- struct files_struct *fsp, SMB_OFF_T offset,
+ size_t n, off_t offset);
+off_t smb_vfs_call_lseek(struct vfs_handle_struct *handle,
+ struct files_struct *fsp, off_t offset,
int whence);
ssize_t smb_vfs_call_sendfile(struct vfs_handle_struct *handle, int tofd,
files_struct *fromfsp, const DATA_BLOB *header,
- SMB_OFF_T offset, size_t count);
+ off_t offset, size_t count);
ssize_t smb_vfs_call_recvfile(struct vfs_handle_struct *handle, int fromfd,
- files_struct *tofsp, SMB_OFF_T offset,
+ files_struct *tofsp, off_t offset,
size_t count);
int smb_vfs_call_rename(struct vfs_handle_struct *handle,
const struct smb_filename *smb_fname_src,
@@ -646,23 +647,23 @@ int smb_vfs_call_ntimes(struct vfs_handle_struct *handle,
const struct smb_filename *smb_fname,
struct smb_file_time *ft);
int smb_vfs_call_ftruncate(struct vfs_handle_struct *handle,
- struct files_struct *fsp, SMB_OFF_T offset);
+ struct files_struct *fsp, off_t offset);
int smb_vfs_call_fallocate(struct vfs_handle_struct *handle,
struct files_struct *fsp,
enum vfs_fallocate_mode mode,
- SMB_OFF_T offset,
- SMB_OFF_T len);
+ off_t offset,
+ off_t len);
bool smb_vfs_call_lock(struct vfs_handle_struct *handle,
- struct files_struct *fsp, int op, SMB_OFF_T offset,
- SMB_OFF_T count, int type);
+ struct files_struct *fsp, int op, off_t offset,
+ off_t count, int type);
int smb_vfs_call_kernel_flock(struct vfs_handle_struct *handle,
struct files_struct *fsp, uint32 share_mode,
--
Samba Shared Repository
More information about the samba-cvs
mailing list