diff options
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/smb.h | 18 | ||||
-rw-r--r-- | source3/include/smbprofile.h | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index 52e1d7d5db7..34900db62a9 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -897,15 +897,15 @@ struct smb_extended_info { */ enum flush_reason_enum { - SEEK_FLUSH, - READ_FLUSH, - WRITE_FLUSH, - READRAW_FLUSH, - OPLOCK_RELEASE_FLUSH, - CLOSE_FLUSH, - SYNC_FLUSH, - SIZECHANGE_FLUSH, + SAMBA_SEEK_FLUSH, + SAMBA_READ_FLUSH, + SAMBA_WRITE_FLUSH, + SAMBA_READRAW_FLUSH, + SAMBA_OPLOCK_RELEASE_FLUSH, + SAMBA_CLOSE_FLUSH, + SAMBA_SYNC_FLUSH, + SAMBA_SIZECHANGE_FLUSH, /* NUM_FLUSH_REASONS must remain the last value in the enumeration. */ - NUM_FLUSH_REASONS}; + SAMBA_NUM_FLUSH_REASONS}; #endif /* _SMB_H */ diff --git a/source3/include/smbprofile.h b/source3/include/smbprofile.h index 79410e597f7..8ecbc301238 100644 --- a/source3/include/smbprofile.h +++ b/source3/include/smbprofile.h @@ -870,7 +870,7 @@ struct profile_stats { unsigned writecache_non_oplock_writes; unsigned writecache_direct_writes; unsigned writecache_init_writes; - unsigned writecache_flushed_writes[NUM_FLUSH_REASONS]; + unsigned writecache_flushed_writes[SAMBA_NUM_FLUSH_REASONS]; unsigned writecache_num_perfect_writes; unsigned writecache_num_write_caches; unsigned writecache_allocated_write_caches; |