[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Wed Jun 13 03:04:04 MDT 2012
The branch, master has been updated
via 96ada4d s4:ntvfs: add '_fn' suffix to all ntvfs_ops function pointers
from 855d23b s3: Use talloc_tos() in more places in dbwrap_util
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 96ada4d87b6d8618919c614765f2ec1d706f4f4a
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Jun 13 09:11:42 2012 +0200
s4:ntvfs: add '_fn' suffix to all ntvfs_ops function pointers
This hopefully fixes the build on systems where _LARGE_FILES
triggers defines of syscalls e.g. '#define lseek lseek64'
on AIX.
metze
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Wed Jun 13 11:03:15 CEST 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source4/ntvfs/cifs/vfs_cifs.c | 64 +++---
source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c | 60 +++---
source4/ntvfs/ipc/vfs_ipc.c | 60 +++---
source4/ntvfs/nbench/vfs_nbench.c | 62 +++---
source4/ntvfs/ntvfs.h | 68 ++++----
source4/ntvfs/ntvfs_generic.c | 54 +++---
source4/ntvfs/ntvfs_interface.c | 256 ++++++++++++------------
source4/ntvfs/posix/vfs_posix.c | 62 +++---
source4/ntvfs/print/vfs_print.c | 8 +-
source4/ntvfs/simple/vfs_simple.c | 60 +++---
source4/ntvfs/smb2/vfs_smb2.c | 62 +++---
source4/ntvfs/unixuid/vfs_unixuid.c | 62 +++---
12 files changed, 439 insertions(+), 439 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c
index fb7a485..552f664 100644
--- a/source4/ntvfs/cifs/vfs_cifs.c
+++ b/source4/ntvfs/cifs/vfs_cifs.c
@@ -1191,38 +1191,38 @@ NTSTATUS ntvfs_cifs_init(void)
ops.type = NTVFS_DISK;
/* fill in all the operations */
- ops.connect = cvfs_connect;
- ops.disconnect = cvfs_disconnect;
- ops.unlink = cvfs_unlink;
- ops.chkpath = cvfs_chkpath;
- ops.qpathinfo = cvfs_qpathinfo;
- ops.setpathinfo = cvfs_setpathinfo;
- ops.open = cvfs_open;
- ops.mkdir = cvfs_mkdir;
- ops.rmdir = cvfs_rmdir;
- ops.rename = cvfs_rename;
- ops.copy = cvfs_copy;
- ops.ioctl = cvfs_ioctl;
- ops.read = cvfs_read;
- ops.write = cvfs_write;
- ops.seek = cvfs_seek;
- ops.flush = cvfs_flush;
- ops.close = cvfs_close;
- ops.exit = cvfs_exit;
- ops.lock = cvfs_lock;
- ops.setfileinfo = cvfs_setfileinfo;
- ops.qfileinfo = cvfs_qfileinfo;
- ops.fsinfo = cvfs_fsinfo;
- ops.lpq = cvfs_lpq;
- ops.search_first = cvfs_search_first;
- ops.search_next = cvfs_search_next;
- ops.search_close = cvfs_search_close;
- ops.trans = cvfs_trans;
- ops.logoff = cvfs_logoff;
- ops.async_setup = cvfs_async_setup;
- ops.cancel = cvfs_cancel;
- ops.notify = cvfs_notify;
- ops.trans2 = cvfs_trans2;
+ ops.connect_fn = cvfs_connect;
+ ops.disconnect_fn = cvfs_disconnect;
+ ops.unlink_fn = cvfs_unlink;
+ ops.chkpath_fn = cvfs_chkpath;
+ ops.qpathinfo_fn = cvfs_qpathinfo;
+ ops.setpathinfo_fn = cvfs_setpathinfo;
+ ops.open_fn = cvfs_open;
+ ops.mkdir_fn = cvfs_mkdir;
+ ops.rmdir_fn = cvfs_rmdir;
+ ops.rename_fn = cvfs_rename;
+ ops.copy_fn = cvfs_copy;
+ ops.ioctl_fn = cvfs_ioctl;
+ ops.read_fn = cvfs_read;
+ ops.write_fn = cvfs_write;
+ ops.seek_fn = cvfs_seek;
+ ops.flush_fn = cvfs_flush;
+ ops.close_fn = cvfs_close;
+ ops.exit_fn = cvfs_exit;
+ ops.lock_fn = cvfs_lock;
+ ops.setfileinfo_fn = cvfs_setfileinfo;
+ ops.qfileinfo_fn = cvfs_qfileinfo;
+ ops.fsinfo_fn = cvfs_fsinfo;
+ ops.lpq_fn = cvfs_lpq;
+ ops.search_first_fn = cvfs_search_first;
+ ops.search_next_fn = cvfs_search_next;
+ ops.search_close_fn = cvfs_search_close;
+ ops.trans_fn = cvfs_trans;
+ ops.logoff_fn = cvfs_logoff;
+ ops.async_setup_fn = cvfs_async_setup;
+ ops.cancel_fn = cvfs_cancel;
+ ops.notify_fn = cvfs_notify;
+ ops.trans2_fn = cvfs_trans2;
/* register ourselves with the NTVFS subsystem. We register
under the name 'cifs'. */
diff --git a/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c b/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c
index 949b6db..8c5a53b 100644
--- a/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c
+++ b/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c
@@ -1061,36 +1061,36 @@ NTSTATUS ntvfs_cifs_posix_init(void)
ZERO_STRUCT(ops);
/* fill in all the operations */
- ops.connect = cifspsx_connect;
- ops.disconnect = cifspsx_disconnect;
- ops.unlink = cifspsx_unlink;
- ops.chkpath = cifspsx_chkpath;
- ops.qpathinfo = cifspsx_qpathinfo;
- ops.setpathinfo = cifspsx_setpathinfo;
- ops.open = cifspsx_open;
- ops.mkdir = cifspsx_mkdir;
- ops.rmdir = cifspsx_rmdir;
- ops.rename = cifspsx_rename;
- ops.copy = cifspsx_copy;
- ops.ioctl = cifspsx_ioctl;
- ops.read = cifspsx_read;
- ops.write = cifspsx_write;
- ops.seek = cifspsx_seek;
- ops.flush = cifspsx_flush;
- ops.close = cifspsx_close;
- ops.exit = cifspsx_exit;
- ops.lock = cifspsx_lock;
- ops.setfileinfo = cifspsx_setfileinfo;
- ops.qfileinfo = cifspsx_qfileinfo;
- ops.fsinfo = cifspsx_fsinfo;
- ops.lpq = cifspsx_lpq;
- ops.search_first = cifspsx_search_first;
- ops.search_next = cifspsx_search_next;
- ops.search_close = cifspsx_search_close;
- ops.trans = cifspsx_trans;
- ops.logoff = cifspsx_logoff;
- ops.async_setup = cifspsx_async_setup;
- ops.cancel = cifspsx_cancel;
+ ops.connect_fn = cifspsx_connect;
+ ops.disconnect_fn = cifspsx_disconnect;
+ ops.unlink_fn = cifspsx_unlink;
+ ops.chkpath_fn = cifspsx_chkpath;
+ ops.qpathinfo_fn = cifspsx_qpathinfo;
+ ops.setpathinfo_fn = cifspsx_setpathinfo;
+ ops.open_fn = cifspsx_open;
+ ops.mkdir_fn = cifspsx_mkdir;
+ ops.rmdir_fn = cifspsx_rmdir;
+ ops.rename_fn = cifspsx_rename;
+ ops.copy_fn = cifspsx_copy;
+ ops.ioctl_fn = cifspsx_ioctl;
+ ops.read_fn = cifspsx_read;
+ ops.write_fn = cifspsx_write;
+ ops.seek_fn = cifspsx_seek;
+ ops.flush_fn = cifspsx_flush;
+ ops.close_fn = cifspsx_close;
+ ops.exit_fn = cifspsx_exit;
+ ops.lock_fn = cifspsx_lock;
+ ops.setfileinfo_fn = cifspsx_setfileinfo;
+ ops.qfileinfo_fn = cifspsx_qfileinfo;
+ ops.fsinfo_fn = cifspsx_fsinfo;
+ ops.lpq_fn = cifspsx_lpq;
+ ops.search_first_fn = cifspsx_search_first;
+ ops.search_next_fn = cifspsx_search_next;
+ ops.search_close_fn = cifspsx_search_close;
+ ops.trans_fn = cifspsx_trans;
+ ops.logoff_fn = cifspsx_logoff;
+ ops.async_setup_fn = cifspsx_async_setup;
+ ops.cancel_fn = cifspsx_cancel;
/* register ourselves with the NTVFS subsystem. We register
under names 'cifsposix'
diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c
index 7fc3b14..50f0e59 100644
--- a/source4/ntvfs/ipc/vfs_ipc.c
+++ b/source4/ntvfs/ipc/vfs_ipc.c
@@ -1308,36 +1308,36 @@ NTSTATUS ntvfs_ipc_init(void)
ops.type = NTVFS_IPC;
/* fill in all the operations */
- ops.connect = ipc_connect;
- ops.disconnect = ipc_disconnect;
- ops.unlink = ipc_unlink;
- ops.chkpath = ipc_chkpath;
- ops.qpathinfo = ipc_qpathinfo;
- ops.setpathinfo = ipc_setpathinfo;
- ops.open = ipc_open;
- ops.mkdir = ipc_mkdir;
- ops.rmdir = ipc_rmdir;
- ops.rename = ipc_rename;
- ops.copy = ipc_copy;
- ops.ioctl = ipc_ioctl;
- ops.read = ipc_read;
- ops.write = ipc_write;
- ops.seek = ipc_seek;
- ops.flush = ipc_flush;
- ops.close = ipc_close;
- ops.exit = ipc_exit;
- ops.lock = ipc_lock;
- ops.setfileinfo = ipc_setfileinfo;
- ops.qfileinfo = ipc_qfileinfo;
- ops.fsinfo = ipc_fsinfo;
- ops.lpq = ipc_lpq;
- ops.search_first = ipc_search_first;
- ops.search_next = ipc_search_next;
- ops.search_close = ipc_search_close;
- ops.trans = ipc_trans;
- ops.logoff = ipc_logoff;
- ops.async_setup = ipc_async_setup;
- ops.cancel = ipc_cancel;
+ ops.connect_fn = ipc_connect;
+ ops.disconnect_fn = ipc_disconnect;
+ ops.unlink_fn = ipc_unlink;
+ ops.chkpath_fn = ipc_chkpath;
+ ops.qpathinfo_fn = ipc_qpathinfo;
+ ops.setpathinfo_fn = ipc_setpathinfo;
+ ops.open_fn = ipc_open;
+ ops.mkdir_fn = ipc_mkdir;
+ ops.rmdir_fn = ipc_rmdir;
+ ops.rename_fn = ipc_rename;
+ ops.copy_fn = ipc_copy;
+ ops.ioctl_fn = ipc_ioctl;
+ ops.read_fn = ipc_read;
+ ops.write_fn = ipc_write;
+ ops.seek_fn = ipc_seek;
+ ops.flush_fn = ipc_flush;
+ ops.close_fn = ipc_close;
+ ops.exit_fn = ipc_exit;
+ ops.lock_fn = ipc_lock;
+ ops.setfileinfo_fn = ipc_setfileinfo;
+ ops.qfileinfo_fn = ipc_qfileinfo;
+ ops.fsinfo_fn = ipc_fsinfo;
+ ops.lpq_fn = ipc_lpq;
+ ops.search_first_fn = ipc_search_first;
+ ops.search_next_fn = ipc_search_next;
+ ops.search_close_fn = ipc_search_close;
+ ops.trans_fn = ipc_trans;
+ ops.logoff_fn = ipc_logoff;
+ ops.async_setup_fn = ipc_async_setup;
+ ops.cancel_fn = ipc_cancel;
/* register ourselves with the NTVFS subsystem. */
ret = ntvfs_register(&ops, &vers);
diff --git a/source4/ntvfs/nbench/vfs_nbench.c b/source4/ntvfs/nbench/vfs_nbench.c
index 565f2da..74a9e43 100644
--- a/source4/ntvfs/nbench/vfs_nbench.c
+++ b/source4/ntvfs/nbench/vfs_nbench.c
@@ -930,40 +930,40 @@ NTSTATUS ntvfs_nbench_init(void)
ops.type = NTVFS_DISK;
/* fill in all the operations */
- ops.connect = nbench_connect;
- ops.disconnect = nbench_disconnect;
- ops.unlink = nbench_unlink;
- ops.chkpath = nbench_chkpath;
- ops.qpathinfo = nbench_qpathinfo;
- ops.setpathinfo = nbench_setpathinfo;
- ops.open = nbench_open;
- ops.mkdir = nbench_mkdir;
- ops.rmdir = nbench_rmdir;
- ops.rename = nbench_rename;
- ops.copy = nbench_copy;
- ops.ioctl = nbench_ioctl;
- ops.read = nbench_read;
- ops.write = nbench_write;
- ops.seek = nbench_seek;
- ops.flush = nbench_flush;
- ops.close = nbench_close;
- ops.exit = nbench_exit;
- ops.lock = nbench_lock;
- ops.setfileinfo = nbench_setfileinfo;
- ops.qfileinfo = nbench_qfileinfo;
- ops.fsinfo = nbench_fsinfo;
- ops.lpq = nbench_lpq;
- ops.search_first = nbench_search_first;
- ops.search_next = nbench_search_next;
- ops.search_close = nbench_search_close;
- ops.trans = nbench_trans;
- ops.logoff = nbench_logoff;
- ops.async_setup = nbench_async_setup;
- ops.cancel = nbench_cancel;
+ ops.connect_fn = nbench_connect;
+ ops.disconnect_fn = nbench_disconnect;
+ ops.unlink_fn = nbench_unlink;
+ ops.chkpath_fn = nbench_chkpath;
+ ops.qpathinfo_fn = nbench_qpathinfo;
+ ops.setpathinfo_fn = nbench_setpathinfo;
+ ops.open_fn = nbench_open;
+ ops.mkdir_fn = nbench_mkdir;
+ ops.rmdir_fn = nbench_rmdir;
+ ops.rename_fn = nbench_rename;
+ ops.copy_fn = nbench_copy;
+ ops.ioctl_fn = nbench_ioctl;
+ ops.read_fn = nbench_read;
+ ops.write_fn = nbench_write;
+ ops.seek_fn = nbench_seek;
+ ops.flush_fn = nbench_flush;
+ ops.close_fn = nbench_close;
+ ops.exit_fn = nbench_exit;
+ ops.lock_fn = nbench_lock;
+ ops.setfileinfo_fn = nbench_setfileinfo;
+ ops.qfileinfo_fn = nbench_qfileinfo;
+ ops.fsinfo_fn = nbench_fsinfo;
+ ops.lpq_fn = nbench_lpq;
+ ops.search_first_fn = nbench_search_first;
+ ops.search_next_fn = nbench_search_next;
+ ops.search_close_fn = nbench_search_close;
+ ops.trans_fn = nbench_trans;
+ ops.logoff_fn = nbench_logoff;
+ ops.async_setup_fn = nbench_async_setup;
+ ops.cancel_fn = nbench_cancel;
/* we don't register a trans2 handler as we want to be able to
log individual trans2 requests */
- ops.trans2 = NULL;
+ ops.trans2_fn = NULL;
/* register ourselves with the NTVFS subsystem. */
ret = ntvfs_register(&ops, &vers);
diff --git a/source4/ntvfs/ntvfs.h b/source4/ntvfs/ntvfs.h
index 463acc3..02dc191 100644
--- a/source4/ntvfs/ntvfs.h
+++ b/source4/ntvfs/ntvfs.h
@@ -47,120 +47,120 @@ struct ntvfs_ops {
enum ntvfs_type type;
/* initial setup */
- NTSTATUS (*connect)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*connect_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_tcon *tcon);
- NTSTATUS (*disconnect)(struct ntvfs_module_context *ntvfs);
+ NTSTATUS (*disconnect_fn)(struct ntvfs_module_context *ntvfs);
/* async_setup - called when a backend is processing a async request */
- NTSTATUS (*async_setup)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*async_setup_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
void *private_data);
/* filesystem operations */
- NTSTATUS (*fsinfo)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*fsinfo_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_fsinfo *fs);
/* path operations */
- NTSTATUS (*unlink)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*unlink_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_unlink *unl);
- NTSTATUS (*chkpath)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*chkpath_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_chkpath *cp);
- NTSTATUS (*qpathinfo)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*qpathinfo_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_fileinfo *st);
- NTSTATUS (*setpathinfo)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*setpathinfo_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_setfileinfo *st);
- NTSTATUS (*mkdir)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*mkdir_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_mkdir *md);
- NTSTATUS (*rmdir)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*rmdir_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
struct smb_rmdir *rd);
- NTSTATUS (*rename)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*rename_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_rename *ren);
- NTSTATUS (*copy)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*copy_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
struct smb_copy *cp);
- NTSTATUS (*open)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*open_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_open *oi);
/* directory search */
- NTSTATUS (*search_first)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*search_first_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_search_first *io, void *private_data,
- bool (*callback)(void *private_data, const union smb_search_data *file));
- NTSTATUS (*search_next)(struct ntvfs_module_context *ntvfs,
+ bool (*callback_fn)(void *private_data, const union smb_search_data *file));
+ NTSTATUS (*search_next_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_search_next *io, void *private_data,
- bool (*callback)(void *private_data, const union smb_search_data *file));
- NTSTATUS (*search_close)(struct ntvfs_module_context *ntvfs,
+ bool (*callback_fn)(void *private_data, const union smb_search_data *file));
+ NTSTATUS (*search_close_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_search_close *io);
/* operations on open files */
- NTSTATUS (*ioctl)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*ioctl_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_ioctl *io);
- NTSTATUS (*read)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*read_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_read *io);
- NTSTATUS (*write)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*write_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_write *io);
- NTSTATUS (*seek)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*seek_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_seek *io);
- NTSTATUS (*flush)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*flush_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_flush *flush);
- NTSTATUS (*lock)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*lock_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_lock *lck);
- NTSTATUS (*qfileinfo)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*qfileinfo_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_fileinfo *info);
- NTSTATUS (*setfileinfo)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*setfileinfo_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_setfileinfo *info);
- NTSTATUS (*close)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*close_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_close *io);
/* trans interface - used by IPC backend for pipes and RAP calls */
- NTSTATUS (*trans)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*trans_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
struct smb_trans2 *trans);
/* trans2 interface - only used by CIFS backend to prover complete passthru for testing */
- NTSTATUS (*trans2)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*trans2_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
struct smb_trans2 *trans2);
/* change notify request */
- NTSTATUS (*notify)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*notify_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_notify *info);
/* cancel - cancels any pending async request */
- NTSTATUS (*cancel)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*cancel_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req);
/* printing specific operations */
- NTSTATUS (*lpq)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*lpq_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_lpq *lpq);
/* logoff - called when a vuid is closed */
- NTSTATUS (*logoff)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*logoff_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req);
- NTSTATUS (*exit)(struct ntvfs_module_context *ntvfs,
+ NTSTATUS (*exit_fn)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req);
};
diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index bed9c9c..0854aa3 100644
--- a/source4/ntvfs/ntvfs_generic.c
+++ b/source4/ntvfs/ntvfs_generic.c
@@ -255,7 +255,7 @@ static NTSTATUS ntvfs_map_open_finish(struct ntvfs_module_context *ntvfs,
sf->standard.in.create_time = 0;
sf->standard.in.write_time = write_time;
sf->standard.in.access_time = 0;
- status = ntvfs->ops->setfileinfo(ntvfs, req, sf);
+ status = ntvfs->ops->setfileinfo_fn(ntvfs, req, sf);
}
if (set_size != 0) {
@@ -264,7 +264,7 @@ static NTSTATUS ntvfs_map_open_finish(struct ntvfs_module_context *ntvfs,
sf->generic.level = RAW_SFILEINFO_END_OF_FILE_INFORMATION;
sf->generic.in.file.ntvfs = io2->generic.out.file.ntvfs;
sf->end_of_file_info.in.size = set_size;
- status = ntvfs->ops->setfileinfo(ntvfs, req, sf);
+ status = ntvfs->ops->setfileinfo_fn(ntvfs, req, sf);
if (NT_STATUS_IS_OK(status)) {
io->openx.out.size = io->openx.in.size;
}
@@ -416,7 +416,7 @@ NTSTATUS ntvfs_map_open(struct ntvfs_module_context *ntvfs,
io2->generic.in.file_attr = io->openx.in.file_attrs;
io2->generic.in.fname = io->openx.in.fname;
- status = ntvfs->ops->open(ntvfs, req, io2);
+ status = ntvfs->ops->open_fn(ntvfs, req, io2);
break;
@@ -433,7 +433,7 @@ NTSTATUS ntvfs_map_open(struct ntvfs_module_context *ntvfs,
io2->generic.in.file_attr = io->openold.in.search_attrs;
io2->generic.in.fname = io->openold.in.fname;
- status = ntvfs->ops->open(ntvfs, req, io2);
+ status = ntvfs->ops->open_fn(ntvfs, req, io2);
break;
case RAW_OPEN_T2OPEN:
@@ -459,7 +459,7 @@ NTSTATUS ntvfs_map_open(struct ntvfs_module_context *ntvfs,
io2->generic.in.ea_list->num_eas = io->t2open.in.num_eas;
io2->generic.in.ea_list->eas = io->t2open.in.eas;
- status = ntvfs->ops->open(ntvfs, req, io2);
+ status = ntvfs->ops->open_fn(ntvfs, req, io2);
break;
--
Samba Shared Repository
More information about the samba-cvs
mailing list