diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-03-28 13:32:54 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-05 02:39:09 +0200 |
| commit | 1ac7f071ce2191599b99eddfb4fb595d2d1f474f (patch) | |
| tree | a83cf9e1d4a96849a30d9761b16b60d2ff39177f /source3/locking | |
| parent | 6098f8d80cb37fba7d2f245ee1a5c184b0f27aea (diff) | |
| download | samba-1ac7f071ce2191599b99eddfb4fb595d2d1f474f.tar.gz | |
build: Remove SMB_F* locking defines
Diffstat (limited to 'source3/locking')
| -rw-r--r-- | source3/locking/posix.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/locking/posix.c b/source3/locking/posix.c index 02402f97747..b219c75fb3d 100644 --- a/source3/locking/posix.c +++ b/source3/locking/posix.c @@ -1065,7 +1065,7 @@ bool set_posix_lock_windows_flavour(files_struct *fsp, DEBUG(5,("set_posix_lock_windows_flavour: Real lock: Type = %s: offset = %.0f, count = %.0f\n", posix_lock_type_name(posix_lock_type), (double)offset, (double)count )); - if (!posix_fcntl_lock(fsp,SMB_F_SETLK,offset,count,posix_lock_type)) { + if (!posix_fcntl_lock(fsp,F_SETLK,offset,count,posix_lock_type)) { *errno_ret = errno; DEBUG(5,("set_posix_lock_windows_flavour: Lock fail !: Type = %s: offset = %.0f, count = %.0f. Errno = %s\n", posix_lock_type_name(posix_lock_type), (double)offset, (double)count, strerror(errno) )); @@ -1087,7 +1087,7 @@ bool set_posix_lock_windows_flavour(files_struct *fsp, DEBUG(5,("set_posix_lock_windows_flavour: Backing out locks: Type = %s: offset = %.0f, count = %.0f\n", posix_lock_type_name(posix_lock_type), (double)offset, (double)count )); - posix_fcntl_lock(fsp,SMB_F_SETLK,offset,count,F_UNLCK); + posix_fcntl_lock(fsp,F_SETLK,offset,count,F_UNLCK); } } else { /* Remember the number of Windows locks we have on this dev/ino pair. */ @@ -1186,7 +1186,7 @@ bool release_posix_lock_windows_flavour(files_struct *fsp, DEBUG(5,("release_posix_lock_windows_flavour: downgrading lock to READ: offset = %.0f, count = %.0f\n", (double)offset, (double)count )); - if (!posix_fcntl_lock(fsp,SMB_F_SETLK,offset,count,F_RDLCK)) { + if (!posix_fcntl_lock(fsp,F_SETLK,offset,count,F_RDLCK)) { DEBUG(0,("release_posix_lock_windows_flavour: downgrade of lock failed with error %s !\n", strerror(errno) )); talloc_destroy(ul_ctx); return False; @@ -1204,7 +1204,7 @@ bool release_posix_lock_windows_flavour(files_struct *fsp, DEBUG(5,("release_posix_lock_windows_flavour: Real unlock: offset = %.0f, count = %.0f\n", (double)offset, (double)count )); - if (!posix_fcntl_lock(fsp,SMB_F_SETLK,offset,count,F_UNLCK)) { + if (!posix_fcntl_lock(fsp,F_SETLK,offset,count,F_UNLCK)) { ret = False; } } @@ -1251,7 +1251,7 @@ bool set_posix_lock_posix_flavour(files_struct *fsp, return True; } - if (!posix_fcntl_lock(fsp,SMB_F_SETLK,offset,count,posix_lock_type)) { + if (!posix_fcntl_lock(fsp,F_SETLK,offset,count,posix_lock_type)) { *errno_ret = errno; DEBUG(5,("set_posix_lock_posix_flavour: Lock fail !: Type = %s: offset = %.0f, count = %.0f. Errno = %s\n", posix_lock_type_name(posix_lock_type), (double)offset, (double)count, strerror(errno) )); @@ -1341,7 +1341,7 @@ bool release_posix_lock_posix_flavour(files_struct *fsp, DEBUG(5,("release_posix_lock_posix_flavour: Real unlock: offset = %.0f, count = %.0f\n", (double)offset, (double)count )); - if (!posix_fcntl_lock(fsp,SMB_F_SETLK,offset,count,F_UNLCK)) { + if (!posix_fcntl_lock(fsp,F_SETLK,offset,count,F_UNLCK)) { ret = False; } } |