Changeset 988 for vendor/current/source4/ntvfs/nbench

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source4/ntvfs/nbench/vfs_nbench.c (modified) (21 diffs)

vendor/current/source4/ntvfs/nbench/vfs_nbench.c

@@ -28 +28 @@
 #include "system/filesys.h"
 
+NTSTATUS ntvfs_nbench_init(void);
+
 /* this is stored in ntvfs_private */
 struct nbench_private {
@@ -125 +127 @@
 
         logname = talloc_asprintf(req, "/tmp/nbenchlog%d.%u", ntvfs->depth,
-                                  getpid());
+                                  (unsigned int)getpid());
         NT_STATUS_HAVE_NO_MEMORY(logname);
         nprivates->log_fd = open(logname, O_WRONLY|O_CREAT|O_APPEND, 0644);
@@ -164 +166 @@
 {
         union smb_unlink *unl = req->async_states->private_data;
-
         nbench_log(req, "Unlink \"%s\" 0x%x %s\n", 
                    unl->unlink.in.pattern, unl->unlink.in.attrib, 
-                   get_nt_error_c_code(req->async_states->status));
+                   get_nt_error_c_code(req, req->async_states->status));
 
         PASS_THRU_REP_POST(req);
@@ -212 +213 @@
         nbench_log(req, "Chkpath \"%s\" %s\n", 
                    cp->chkpath.in.path, 
-                   get_nt_error_c_code(req->async_states->status));
+                   get_nt_error_c_code(req, req->async_states->status));
 
         PASS_THRU_REP_POST(req);
@@ -238 +239 @@
                    info->generic.in.file.path, 
                    info->generic.level,
-                   get_nt_error_c_code(req->async_states->status));
+                   get_nt_error_c_code(req, req->async_states->status));
 
         PASS_THRU_REP_POST(req);
@@ -263 +264 @@
                    nbench_ntvfs_handle_string(req, info->generic.in.file.ntvfs),
                    info->generic.level,
-                   get_nt_error_c_code(req->async_states->status));
+                   get_nt_error_c_code(req, req->async_states->status));
 
         PASS_THRU_REP_POST(req);
@@ -288 +289 @@
                    st->generic.in.file.path, 
                    st->generic.level,
-                   get_nt_error_c_code(req->async_states->status));
+                   get_nt_error_c_code(req, req->async_states->status));
 
         PASS_THRU_REP_POST(req);
@@ -320 +321 @@
                            io->ntcreatex.in.open_disposition, 
                            nbench_ntvfs_handle_string(req, io->ntcreatex.out.file.ntvfs),
-                           get_nt_error_c_code(req->async_states->status));
+                           get_nt_error_c_code(req, req->async_states->status));
                 break;
 
@@ -372 +373 @@
         nbench_log(req, "Rmdir \"%s\" %s\n", 
                    rd->in.path, 
-                   get_nt_error_c_code(req->async_states->status));
+                   get_nt_error_c_code(req, req->async_states->status));
 
         PASS_THRU_REP_POST(req);
@@ -399 +400 @@
                            ren->rename.in.pattern1, 
                            ren->rename.in.pattern2, 
-                           get_nt_error_c_code(req->async_states->status));
+                           get_nt_error_c_code(req, req->async_states->status));
                 break;
 
@@ -458 +459 @@
                            rd->readx.in.maxcnt,
                            rd->readx.out.nread,
-                           get_nt_error_c_code(req->async_states->status));
+                           get_nt_error_c_code(req, req->async_states->status));
                 break;
         default:
@@ -496 +497 @@
                            wr->writex.in.count,
                            wr->writex.out.nwritten,
-                           get_nt_error_c_code(req->async_states->status));
+                           get_nt_error_c_code(req, req->async_states->status));
                 break;
 
@@ -508 +509 @@
                            wr->write.in.count,
                            wr->write.out.nwritten,
-                           get_nt_error_c_code(req->async_states->status));
+                           get_nt_error_c_code(req, req->async_states->status));
                 break;
 
@@ -562 +563 @@
                 nbench_log(req, "Flush %s %s\n",
                            nbench_ntvfs_handle_string(req, io->flush.in.file.ntvfs),
-                           get_nt_error_c_code(req->async_states->status));
+                           get_nt_error_c_code(req, req->async_states->status));
                 break;
         case RAW_FLUSH_ALL:
                 nbench_log(req, "Flush %d %s\n",
                            0xFFFF,
-                           get_nt_error_c_code(req->async_states->status));
+                           get_nt_error_c_code(req, req->async_states->status));
                 break;
         default:
@@ -600 +601 @@
                 nbench_log(req, "Close %s %s\n",
                            nbench_ntvfs_handle_string(req, io->close.in.file.ntvfs),
-                           get_nt_error_c_code(req->async_states->status));
+                           get_nt_error_c_code(req, req->async_states->status));
                 break;
 
@@ -717 +718 @@
                            (int)lck->lockx.in.locks[0].offset,
                            (int)lck->lockx.in.locks[0].count,
-                           get_nt_error_c_code(req->async_states->status));
+                           get_nt_error_c_code(req, req->async_states->status));
         } else if (lck->generic.level == RAW_LOCK_LOCKX &&
                    lck->lockx.in.ulock_cnt == 1) {
@@ -724 +725 @@
                            (int)lck->lockx.in.locks[0].offset,
                            (int)lck->lockx.in.locks[0].count,
-                           get_nt_error_c_code(req->async_states->status));
+                           get_nt_error_c_code(req, req->async_states->status));
         } else {
                 nbench_log(req, "Lock-%d - NOT HANDLED\n", lck->generic.level);
@@ -752 +753 @@
                    nbench_ntvfs_handle_string(req, info->generic.in.file.ntvfs),
                    info->generic.level,
-                   get_nt_error_c_code(req->async_states->status));
+                   get_nt_error_c_code(req, req->async_states->status));
 
         PASS_THRU_REP_POST(req);
@@ -777 +778 @@
         nbench_log(req, "QUERY_FS_INFORMATION %d %s\n", 
                    fs->generic.level, 
-                   get_nt_error_c_code(req->async_states->status));
+                   get_nt_error_c_code(req, req->async_states->status));
 
         PASS_THRU_REP_POST(req);
@@ -831 +832 @@
                            io->t2ffirst.in.max_count,
                            io->t2ffirst.out.count,
-                           get_nt_error_c_code(req->async_states->status));
+                           get_nt_error_c_code(req, req->async_states->status));
                 break;
                 
@@ -930 +931 @@
         
         /* 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. */