diff options
| author | Jeremy Allison <jra@samba.org> | 2002-09-11 01:05:22 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-09-11 01:05:22 +0000 |
| commit | 237e36124cedf0485deaff81f34688fa862c3317 (patch) | |
| tree | f41dd419c0a7f470b7679586ba2f221147b7cb21 /source/include/smb_macros.h | |
| parent | c93b40f43d5f5027f26c9b6bb906011a9075db2d (diff) | |
| download | samba-237e36124cedf0485deaff81f34688fa862c3317.tar.gz samba-237e36124cedf0485deaff81f34688fa862c3317.tar.xz samba-237e36124cedf0485deaff81f34688fa862c3317.zip | |
Ensure we've failed a lock with a lock denied message before automatically
pushing it onto the blocking queue.
Jeremy.
Diffstat (limited to 'source/include/smb_macros.h')
| -rw-r--r-- | source/include/smb_macros.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/source/include/smb_macros.h b/source/include/smb_macros.h index ccf151fab2b..71d4bac7952 100644 --- a/source/include/smb_macros.h +++ b/source/include/smb_macros.h @@ -80,17 +80,20 @@ #define FNUM_OK(fsp,c) (OPEN_FSP(fsp) && (c)==(fsp)->conn) #define CHECK_FSP(fsp,conn) if (!FNUM_OK(fsp,conn)) \ - return(ERROR_DOS(ERRDOS,ERRbadfid)); \ - else if((fsp)->fd == -1) \ - return(ERROR_DOS(ERRDOS,ERRbadaccess)) + return(ERROR_DOS(ERRDOS,ERRbadfid)); \ + else if((fsp)->fd == -1) \ + return(ERROR_DOS(ERRDOS,ERRbadaccess)) #define CHECK_READ(fsp) if (!(fsp)->can_read) \ - return(ERROR_DOS(ERRDOS,ERRbadaccess)) + return(ERROR_DOS(ERRDOS,ERRbadaccess)) #define CHECK_WRITE(fsp) if (!(fsp)->can_write) \ - return(ERROR_DOS(ERRDOS,ERRbadaccess)) + return(ERROR_DOS(ERRDOS,ERRbadaccess)) #define CHECK_ERROR(fsp) if (HAS_CACHED_ERROR(fsp)) \ - return(CACHED_ERROR(fsp)) + return(CACHED_ERROR(fsp)) + +#define ERROR_WAS_LOCK_DENIED(status) (NT_STATUS_EQUAL((status), NT_STATUS_LOCK_NOT_GRANTED) || \ + NT_STATUS_EQUAL((status), NT_STATUS_FILE_LOCK_CONFLICT) ) /* translates a connection number into a service number */ #define SNUM(conn) ((conn)?(conn)->service:-1) |