diff options
author | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
commit | 6da26870e0ae5acd6ff49a30ec2f6886b44d095e (patch) | |
tree | 850c71039563c16a5d563c47e7ba2ab645baf198 /source3/include/vfs_macros.h | |
parent | 6925a799d04c6fa59dd2ddef1f5510f9bb7d17d1 (diff) | |
parent | 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 (diff) | |
download | samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.tar.gz samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.tar.bz2 samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.zip |
Merge 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 as Samba-4.0alpha16
Diffstat (limited to 'source3/include/vfs_macros.h')
-rw-r--r-- | source3/include/vfs_macros.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index d04be9b5aa..c7686f1db5 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -239,10 +239,10 @@ #define SMB_VFS_NEXT_CHDIR(handle, path) \ smb_vfs_call_chdir((handle)->next, (path)) -#define SMB_VFS_GETWD(conn, buf) \ - smb_vfs_call_getwd((conn)->vfs_handles, (buf)) -#define SMB_VFS_NEXT_GETWD(handle, buf) \ - smb_vfs_call_getwd((handle)->next, (buf)) +#define SMB_VFS_GETWD(conn) \ + smb_vfs_call_getwd((conn)->vfs_handles) +#define SMB_VFS_NEXT_GETWD(handle) \ + smb_vfs_call_getwd((handle)->next) #define SMB_VFS_NTIMES(conn, path, ts) \ smb_vfs_call_ntimes((conn)->vfs_handles, (path), (ts)) @@ -364,9 +364,6 @@ #define SMB_VFS_NEXT_TRANSLATE_NAME(handle, name, direction, mem_ctx, mapped_name) \ smb_vfs_call_translate_name((handle)->next, (name), (direction), (mem_ctx), (mapped_name)) -#define SMB_VFS_NEXT_STRICT_UNLOCK(handle, fsp, plock) \ - smb_vfs_call_strict_unlock((handle)->next, (fsp), (plock)) - #define SMB_VFS_FGET_NT_ACL(fsp, security_info, ppdesc) \ smb_vfs_call_fget_nt_acl((fsp)->conn->vfs_handles, (fsp), (security_info), (ppdesc)) #define SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, security_info, ppdesc) \ |