smbd: Add brl_num_locks access function

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 2e08ce64ef868aff2bd01ca02adc2ead43889599..0639649576b8b7f92323245d47313b7943575817 100644 (file)
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -63,6 +63,11 @@ static void print_lock_struct(unsigned int i, const struct lock_struct *pls)
                lock_flav_name(pls->lock_flav) ));
 }
 
+unsigned int brl_num_locks(const struct byte_range_lock *brl)
+{
+       return brl->num_locks;
+}
+
 /****************************************************************************
  See if two locking contexts are equal.
 ****************************************************************************/

diff --git a/source3/locking/proto.h b/source3/locking/proto.h
index a51c5a204c4fca6950627dbee961d4ad258a25ec..f5137f97d27b12b5e2775e59e4d5ff2925166084 100644 (file)
--- a/source3/locking/proto.h
+++ b/source3/locking/proto.h
@@ -28,6 +28,8 @@
 void brl_init(bool read_only);
 void brl_shutdown(void);
 
+unsigned int brl_num_locks(const struct byte_range_lock *brl);
+
 NTSTATUS brl_lock_windows_default(struct byte_range_lock *br_lck,
                struct lock_struct *plock,
                bool blocking_lock);

diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 3d4ee22ea1aa7ce4db0a4667a04d449ceee3064b..22737e858c80c5f6f061973181c738da8a3db655 100644 (file)
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -106,7 +106,7 @@ static void enum_file_fn( const struct share_mode_entry *e,
        fsp.file_id = e->id;
 
        if ( (brl = brl_get_locks(talloc_tos(), &fsp)) != NULL ) {
-               num_locks = brl->num_locks;
+               num_locks = brl_num_locks(brl);
                TALLOC_FREE(brl);
        }
 

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index b9618b41dcd71a37ca5376bbddbf24716c2209f7..1a86233fd9ff2faaf553a86bfa3f79bee5c4b204 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1368,7 +1368,7 @@ static bool file_has_brlocks(files_struct *fsp)
        if (!br_lck)
                return false;
 
-       return (br_lck->num_locks > 0);
+       return (brl_num_locks(br_lck) > 0);
 }
 
 static void grant_fsp_oplock_type(files_struct *fsp,