diff options
| author | Gerald Carter <jerry@samba.org> | 2007-03-20 16:56:16 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2007-03-20 16:56:16 +0000 |
| commit | 651d5a89c59c107c05e789358624058e16af1b66 (patch) | |
| tree | dfd29754255ea87b30eb16a06c505e42f98b9be3 /source/include/smb.h | |
| parent | 0f475ed1a387e37d477fd434c06ad5783c58adea (diff) | |
| download | samba-651d5a89c59c107c05e789358624058e16af1b66.tar.gz samba-651d5a89c59c107c05e789358624058e16af1b66.tar.xz samba-651d5a89c59c107c05e789358624058e16af1b66.zip | |
r21889: * Pull from SAMBA-3_0_25 svn r21888
* Set version to 3.0.25pre2
Diffstat (limited to 'source/include/smb.h')
| -rw-r--r-- | source/include/smb.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/include/smb.h b/source/include/smb.h index 3f0356f2248..a8fb39797b2 100644 --- a/source/include/smb.h +++ b/source/include/smb.h @@ -500,12 +500,13 @@ typedef struct files_struct { uint32 access_mask; /* NTCreateX access bits (FILE_READ_DATA etc.) */ uint32 share_access; /* NTCreateX share constants (FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE). */ BOOL pending_modtime_owner; - time_t pending_modtime; - time_t last_write_time; + struct timespec pending_modtime; + struct timespec last_write_time; int oplock_type; int sent_oplock_break; struct timed_event *oplock_timeout; struct lock_struct last_lock_failure; + int current_lock_count; /* Count the number of outstanding locks and pending locks. */ struct share_mode_entry *pending_break_messages; int num_pending_break_messages; |