Commit a003d0e5 authored by Jeremy Allison's avatar Jeremy Allison Committed by Gerald (Jerry) Carter
Browse files

r1311: Turn on sendfile for non-oplocked files. tridge proved 

this is the correct thing to do on a train in Germany :-).
Turn on sendfile by default ! It's about time.....
Jeremy.
(This used to be commit ec614a8f7d158b57f5981c1515962aca3c3e6ef4)
parent 57c07e27

source3/param/loadparm.c

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ static service sDefault = { 
	False,			/* bUseClientDriver */

	False,			/* bDefaultDevmode */

	True,			/* bNTAclSupport */

	False,			/* bUseSendfile */

	True,			/* bUseSendfile */

	False,			/* bProfileAcls */

	False,			/* bMap_acl_inherit */

	False,			/* bAfs_Share */

source3/smbd/reply.c

+10 −8
Original line number Diff line number Diff line
@@ -1729,12 +1729,13 @@ void send_file_readbraw(connection_struct *conn, files_struct *fsp, SMB_OFF_T st 


#if defined(WITH_SENDFILE)

	/*

	 * We can only use sendfile on a non-chained packet and on a file

	 * that is exclusively oplocked. reply_readbraw has already checked the length.

	 * We can only use sendfile on a non-chained packet 

	 * but we can use on a non-oplocked file. tridge proved this

	 * on a train in Germany :-). JRA.

	 * reply_readbraw has already checked the length.

	 */



	if ((nread > 0) && (lp_write_cache_size(SNUM(conn)) == 0) &&

			EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type) && lp_use_sendfile(SNUM(conn)) ) {

	if ((nread > 0) && (lp_write_cache_size(SNUM(conn)) == 0) && lp_use_sendfile(SNUM(conn)) ) {

		DATA_BLOB header;



		_smb_setlen(outbuf,nread);
@@ -2067,12 +2068,13 @@ int send_file_readX(connection_struct *conn, char *inbuf,char *outbuf,int length 


#if defined(WITH_SENDFILE)

	/*

	 * We can only use sendfile on a non-chained packet and on a file

	 * that is exclusively oplocked.

	 * We can only use sendfile on a non-chained packet 

	 * but we can use on a non-oplocked file. tridge proved this

	 * on a train in Germany :-). JRA.

	 */



	if ((CVAL(inbuf,smb_vwv0) == 0xFF) && EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type) &&

			lp_use_sendfile(SNUM(conn)) && (lp_write_cache_size(SNUM(conn)) == 0) ) {

	if ((CVAL(inbuf,smb_vwv0) == 0xFF) && lp_use_sendfile(SNUM(conn)) &&

			(lp_write_cache_size(SNUM(conn)) == 0) ) {

		SMB_STRUCT_STAT sbuf;

		DATA_BLOB header;