summaryrefslogtreecommitdiff
path: root/source4/ntvfs/posix/pvfs_open.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-04 13:27:29 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:29 -0500
commitb2617daeb658af9959ea71432d87fa4273b7f1a4 (patch)
treedc909705ac11fdcffb4804931d8da791fc808c40 /source4/ntvfs/posix/pvfs_open.c
parent39cd0639e9007bfd8b896b335aea50ace8631112 (diff)
downloadsamba-b2617daeb658af9959ea71432d87fa4273b7f1a4.tar.gz
samba-b2617daeb658af9959ea71432d87fa4273b7f1a4.tar.bz2
samba-b2617daeb658af9959ea71432d87fa4273b7f1a4.zip
r3532: make sharing violation delay in pvfs configurable with "posix:sharedelay = usecs"
(This used to be commit c4758776491e5ed9f5b8c387226d1e75bc70eb2e)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_open.c')
-rw-r--r--source4/ntvfs/posix/pvfs_open.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c
index 2c0f55cf22..06191cee0a 100644
--- a/source4/ntvfs/posix/pvfs_open.c
+++ b/source4/ntvfs/posix/pvfs_open.c
@@ -34,8 +34,6 @@
#define PVFS_MIN_NEW_FNUM 0x200
#define PVFS_MIN_DIR_FNUM 0x300
-#define SHARING_VIOLATION_DELAY 1000000
-
/*
find open file handle given fnum
*/
@@ -540,7 +538,7 @@ static NTSTATUS pvfs_open_setup_retry(struct smbsrv_request *req,
r->io = io;
r->f = f;
r->req = req;
- r->end_time = timeval_current_ofs(0, SHARING_VIOLATION_DELAY);
+ r->end_time = timeval_current_ofs(0, pvfs->sharing_violation_delay);
r->open_flags = open_flags;
/* setup a pending lock */