s3: VFS: delay_inject: Remove SMB_VFS_NTIMES()

Signed-off-by: Samuel Cabrero <scabrero@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/modules/vfs_delay_inject.c b/source3/modules/vfs_delay_inject.c
index 14774ccba4a0072388e7ed7eab34788b07baf644..e0a881eaf739b5d1c25d4f076779d5c454d8d360 100644 (file)
--- a/source3/modules/vfs_delay_inject.c
+++ b/source3/modules/vfs_delay_inject.c
@@ -40,15 +40,6 @@ static void inject_delay(const char *vfs_func, vfs_handle_struct *handle)
        smb_msleep(delay);
 }
 
-static int vfs_delay_inject_ntimes(vfs_handle_struct *handle,
-                                  const struct smb_filename *smb_fname,
-                                  struct smb_file_time *ft)
-{
-       inject_delay("ntimes", handle);
-
-       return SMB_VFS_NEXT_NTIMES(handle, smb_fname, ft);
-}
-
 static int vfs_delay_inject_fntimes(vfs_handle_struct *handle,
                                    files_struct *fsp,
                                    struct smb_file_time *ft)
@@ -431,7 +422,6 @@ static bool vfs_delay_inject_brl_unlock_windows(struct vfs_handle_struct *handle
 }
 
 static struct vfs_fn_pointers vfs_delay_inject_fns = {
-       .ntimes_fn = vfs_delay_inject_ntimes,
        .fntimes_fn = vfs_delay_inject_fntimes,
        .pread_send_fn = vfs_delay_inject_pread_send,
        .pread_recv_fn = vfs_delay_inject_pread_recv,

diff --git a/source3/script/tests/test_durable_handle_reconnect.sh b/source3/script/tests/test_durable_handle_reconnect.sh
index c75c6124ef1fb5e7745187b601fc8acb29bb460d..8f61837d7e1aa89fb14c8d3fdf0e874c150e5f89 100755 (executable)
--- a/source3/script/tests/test_durable_handle_reconnect.sh
+++ b/source3/script/tests/test_durable_handle_reconnect.sh
@@ -11,7 +11,7 @@ cd $SELFTEST_TMPDIR || exit 1
 
 delay_inject_conf=$(dirname $SMB_CONF_PATH)/delay_inject.conf
 
-echo 'delay_inject:ntimes = 5000' > $delay_inject_conf
+echo 'delay_inject:fntimes = 5000' > $delay_inject_conf
 
 testit "durable_v2_delay.durable_v2_reconnect_delay" $VALGRIND \
        $BINDIR/smbtorture //$SERVER_IP/delay_inject \