s3/locking: pass persistent to brl_lock() and add it to struct lock_struct

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Anoop C S <anoopcs@samba.org>

diff --git a/source3/include/locking.h b/source3/include/locking.h
index 695c6af814480c718a471803d6f9bf5df5eda2cd..66532be4c8beacbbc8c7f5dd785c1ef60ba6a92a 100644 (file)
--- a/source3/include/locking.h
+++ b/source3/include/locking.h
@@ -75,6 +75,7 @@ struct lock_struct {
        uint64_t fnum;
        enum brl_type lock_type;
        enum brl_flavour lock_flav;
+       bool persistent;
 };
 
 struct smbd_lock_element {

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 029fb920630adc79202dcee64dccf691e520d896..f46147b7153f03e699affca2ff29dc2b9e7f3efd 100644 (file)
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -937,6 +937,7 @@ NTSTATUS brl_lock(
        br_off size,
        enum brl_type lock_type,
        enum brl_flavour lock_flav,
+       bool persistent,
        struct server_id *blocker_pid,
        uint64_t *psmblctx)
 {
@@ -953,7 +954,8 @@ NTSTATUS brl_lock(
                .size = size,
                .fnum = br_lck->fsp->fnum,
                .lock_type = lock_type,
-               .lock_flav = lock_flav
+               .lock_flav = lock_flav,
+               .persistent = persistent,
        };
 
        if (lock_flav == WINDOWS_LOCK) {

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index f3f51682e680d84e0e1cecdfb93035f7f7cb17ec..22691896bda5232548cc953e50694c062f836a2a 100644 (file)
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -324,6 +324,7 @@ NTSTATUS do_lock(struct byte_range_lock *br_lck,
                          count,
                          lock_type,
                          lock_flav,
+                         fsp->op->global->persistent,
                          &blocker_pid,
                          &blocker_smblctx);
        brl_req_set(br_lck, NULL, NULL);

diff --git a/source3/locking/proto.h b/source3/locking/proto.h
index e12c34712a4c5d82066cf9a206ee53cb87df428c..0cb19a25a56434873d9c7cbdac0bd34de40d7c65 100644 (file)
--- a/source3/locking/proto.h
+++ b/source3/locking/proto.h
@@ -55,6 +55,7 @@ NTSTATUS brl_lock(
        br_off size,
        enum brl_type lock_type,
        enum brl_flavour lock_flav,
+       bool persistent,
        struct server_id *blocker_pid,
        uint64_t *psmblctx);
 bool brl_unlock(struct byte_range_lock *br_lck,