summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-12-13 14:00:34 -0800
committerJeremy Allison <jra@samba.org>2010-12-13 23:47:07 +0100
commit041428352c36d548de738fbe971a1361e3a5402b (patch)
treee4c4d6e593358fc5d67c0f3897bc58575ba8b983
parent6ce365b238755ccd64b1c2aca0933f8e717300b0 (diff)
downloadsamba-041428352c36d548de738fbe971a1361e3a5402b.tar.gz
samba-041428352c36d548de738fbe971a1361e3a5402b.tar.bz2
samba-041428352c36d548de738fbe971a1361e3a5402b.zip
As we handle missing sendfile() inside lib/sendfile.c, remove the WITH_SENDFILE ifdefs.
Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Mon Dec 13 23:47:07 CET 2010 on sn-devel-104
-rw-r--r--source3/smbd/reply.c7
-rw-r--r--source3/utils/status_profile.c2
2 files changed, 0 insertions, 9 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 5af5dacc9b..9601f5353a 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2864,7 +2864,6 @@ static ssize_t fake_sendfile(files_struct *fsp, SMB_OFF_T startpos,
return (ssize_t)nread;
}
-#if defined(WITH_SENDFILE)
/****************************************************************************
Deal with the case of sendfile reading less bytes from the file than
requested. Fill with zeros (all we can do).
@@ -2934,7 +2933,6 @@ static void sendfile_short_send(files_struct *fsp,
SAFE_FREE(buf);
}
}
-#endif /* defined WITH_SENDFILE */
/****************************************************************************
Return a readbraw error (4 bytes of zero).
@@ -2978,7 +2976,6 @@ static void send_file_readbraw(connection_struct *conn,
char *outbuf = NULL;
ssize_t ret=0;
-#if defined(WITH_SENDFILE)
/*
* We can only use sendfile on a non-chained packet
* but we can use on a non-oplocked file. tridge proved this
@@ -3053,7 +3050,6 @@ static void send_file_readbraw(connection_struct *conn,
}
normal_readbraw:
-#endif
outbuf = TALLOC_ARRAY(NULL, char, nread+4);
if (!outbuf) {
@@ -3528,7 +3524,6 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req,
goto nosendfile_read;
}
-#if defined(WITH_SENDFILE)
/*
* We can only use sendfile on a non-chained packet
* but we can use on a non-oplocked file. tridge proved this
@@ -3621,8 +3616,6 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req,
normal_read:
-#endif
-
if ((smb_maxcnt & 0xFF0000) > 0x10000) {
uint8 headerbuf[smb_size + 2*12];
diff --git a/source3/utils/status_profile.c b/source3/utils/status_profile.c
index d39ae2d074..ec0ea03806 100644
--- a/source3/utils/status_profile.c
+++ b/source3/utils/status_profile.c
@@ -81,11 +81,9 @@ bool status_profile_dump(bool verbose)
d_printf("pwrite_count: %u\n", profile_p->syscall_pwrite_count);
d_printf("pwrite_time: %u\n", profile_p->syscall_pwrite_time);
d_printf("pwrite_bytes: %u\n", profile_p->syscall_pwrite_bytes);
-#ifdef WITH_SENDFILE
d_printf("sendfile_count: %u\n", profile_p->syscall_sendfile_count);
d_printf("sendfile_time: %u\n", profile_p->syscall_sendfile_time);
d_printf("sendfile_bytes: %u\n", profile_p->syscall_sendfile_bytes);
-#endif
d_printf("lseek_count: %u\n", profile_p->syscall_lseek_count);
d_printf("lseek_time: %u\n", profile_p->syscall_lseek_time);
d_printf("rename_count: %u\n", profile_p->syscall_rename_count);