From: Jeremy Allison <jra@samba.org>
Date: Wed, 3 May 2006 03:42:56 +0000 (+0000)
Subject: r15404: Check for WRITE_THOUGH before calling lp_ fn. I hate
X-Git-Tag: samba-4.0.0alpha6~801^2~8519
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aca0a3ad3a9646e821f2d4c3d30f3a14592df4ae;p=thirdparty%2Fsamba.git

r15404: Check for WRITE_THOUGH before calling lp_ fn. I hate
extra fn calls.
Jeremy.
(This used to be commit e468e1e5c2dbee29066f0efe4141d8705def5d6f)
---

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 1c8716abdac..3d537b2f394 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1308,7 +1308,7 @@ files_struct *open_file_ntcreate(connection_struct *conn,
 	 */
 
 #if defined(O_SYNC)
-	if (lp_strict_sync(SNUM(conn)) && (create_options & FILE_WRITE_THROUGH)) {
+	if ((create_options & FILE_WRITE_THROUGH) && lp_strict_sync(SNUM(conn))) {
 		flags2 |= O_SYNC;
 	}
 #endif /* O_SYNC */