summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2005-07-15 19:32:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:00:07 -0500
commit787e526652b2f754ca9441a6fdf8e0745ac4d54a (patch)
tree6f0a95f07e70d52f2c43dfa96a4d9c9a88a7d745
parenta5868d58c718e9122f65db50f1799bcb82c778a0 (diff)
downloadsamba-787e526652b2f754ca9441a6fdf8e0745ac4d54a.tar.gz
samba-787e526652b2f754ca9441a6fdf8e0745ac4d54a.tar.bz2
samba-787e526652b2f754ca9441a6fdf8e0745ac4d54a.zip
r8508: Rename EXCLUSIVE_BREAK_SENT to BREAK_TO_NONE_SENT.
Volker (This used to be commit 1993e409a53908d299f0b2b0e8e5546236fd580b)
-rw-r--r--source3/include/smb.h2
-rw-r--r--source3/smbd/oplock.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 2ea6633ceb..097fb87a3f 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -557,7 +557,7 @@ struct current_user
/* Defines for the sent_oplock_break field above. */
#define NO_BREAK_SENT 0
-#define EXCLUSIVE_BREAK_SENT 1
+#define BREAK_TO_NONE_SENT 1
#define LEVEL_II_BREAK_SENT 2
typedef struct {
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 3cfce5c7a1..2e6789267b 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -276,7 +276,7 @@ BOOL remove_oplock(files_struct *fsp, BOOL break_to_none)
return False;
}
- if (fsp->sent_oplock_break == EXCLUSIVE_BREAK_SENT || break_to_none) {
+ if (fsp->sent_oplock_break == BREAK_TO_NONE_SENT || break_to_none) {
/*
* Deal with a reply when a break-to-none was sent.
*/
@@ -784,7 +784,7 @@ static BOOL oplock_break(SMB_DEV_T dev, SMB_INO_T inode, unsigned long file_id,
prepare_break_message( outbuf, fsp, using_levelII);
/* Remember if we just sent a break to level II on this file. */
- fsp->sent_oplock_break = using_levelII? LEVEL_II_BREAK_SENT:EXCLUSIVE_BREAK_SENT;
+ fsp->sent_oplock_break = using_levelII? LEVEL_II_BREAK_SENT:BREAK_TO_NONE_SENT;
/* Save the server smb signing state. */
sign_state = srv_oplock_set_signing(False);