diff options
| author | Jeremy Allison <jra@samba.org> | 2013-11-21 21:33:33 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-11-22 08:56:38 -0800 |
| commit | 4e6934ec6c163ad6fd9c317b5a7dd7775b0dc83f (patch) | |
| tree | a8eb9753e8a1638e11654f983af20ea9d45099c4 /source3/smbd/vfs.c | |
| parent | e665fc394074e5aebc22baa4aa1d8d45077ce37d (diff) | |
| download | samba-4e6934ec6c163ad6fd9c317b5a7dd7775b0dc83f.tar.gz samba-4e6934ec6c163ad6fd9c317b5a7dd7775b0dc83f.tar.xz samba-4e6934ec6c163ad6fd9c317b5a7dd7775b0dc83f.zip | |
Rename the profile enums with a SAMBA_ prefix to avoid conflict with system files.
WRITE_FLUSH is defined in fs.h in Linux.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Diffstat (limited to 'source3/smbd/vfs.c')
| -rw-r--r-- | source3/smbd/vfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c index ca6500cf8cc..de0cc972056 100644 --- a/source3/smbd/vfs.c +++ b/source3/smbd/vfs.c @@ -551,7 +551,7 @@ int vfs_allocate_file_space(files_struct *fsp, uint64_t len) contend_level2_oplocks_begin(fsp, LEVEL2_CONTEND_ALLOC_SHRINK); - flush_write_cache(fsp, SIZECHANGE_FLUSH); + flush_write_cache(fsp, SAMBA_SIZECHANGE_FLUSH); if ((ret = SMB_VFS_FTRUNCATE(fsp, (off_t)len)) != -1) { set_filelen_write_cache(fsp, len); } @@ -616,7 +616,7 @@ int vfs_set_filelen(files_struct *fsp, off_t len) DEBUG(10,("vfs_set_filelen: ftruncate %s to len %.0f\n", fsp_str_dbg(fsp), (double)len)); - flush_write_cache(fsp, SIZECHANGE_FLUSH); + flush_write_cache(fsp, SAMBA_SIZECHANGE_FLUSH); if ((ret = SMB_VFS_FTRUNCATE(fsp, len)) != -1) { set_filelen_write_cache(fsp, len); notify_fname(fsp->conn, NOTIFY_ACTION_MODIFIED, @@ -705,7 +705,7 @@ int vfs_fill_sparse(files_struct *fsp, off_t len) contend_level2_oplocks_begin(fsp, LEVEL2_CONTEND_FILL_SPARSE); - flush_write_cache(fsp, SIZECHANGE_FLUSH); + flush_write_cache(fsp, SAMBA_SIZECHANGE_FLUSH); offset = fsp->fsp_name->st.st_ex_size; num_to_write = len - fsp->fsp_name->st.st_ex_size; |