r22846: Chunk one to replace message_send_pid with messaging_send: Deep inside

[sfrench/samba-autobuild/.git] / source / locking / locking.c

diff --git a/source/locking/locking.c b/source/locking/locking.c
index 6c4e896a2a98fd9573c2f2c6a3170a42fcd3af51..28a7fab97d3fd2c0a30fc783adba92df404b77c2 100644 (file)
--- a/source/locking/locking.c
+++ b/source/locking/locking.c
@@ -180,7 +180,8 @@ NTSTATUS query_lock(files_struct *fsp,
  Utility function called by locking requests.
 ****************************************************************************/
 
-struct byte_range_lock *do_lock(files_struct *fsp,
+struct byte_range_lock *do_lock(struct messaging_context *msg_ctx,
+                       files_struct *fsp,
                        uint32 lock_pid,
                        SMB_BIG_UINT count,
                        SMB_BIG_UINT offset,
@@ -213,7 +214,8 @@ struct byte_range_lock *do_lock(files_struct *fsp,
                return NULL;
        }
 
-       *perr = brl_lock(br_lck,
+       *perr = brl_lock(msg_ctx,
+                       br_lck,
                        lock_pid,
                        procid_self(),
                        offset,
@@ -222,6 +224,12 @@ struct byte_range_lock *do_lock(files_struct *fsp,
                        lock_flav,
                        blocking_lock);
 
+       /* blocking ie. pending, locks also count here,
+        * as this is an efficiency counter to avoid checking
+        * the lock db. on close. JRA. */
+
+       fsp->current_lock_count++;
+
        return br_lck;
 }
 
@@ -229,7 +237,8 @@ struct byte_range_lock *do_lock(files_struct *fsp,
  Utility function called by unlocking requests.
 ****************************************************************************/
 
-NTSTATUS do_unlock(files_struct *fsp,
+NTSTATUS do_unlock(struct messaging_context *msg_ctx,
+                       files_struct *fsp,
                        uint32 lock_pid,
                        SMB_BIG_UINT count,
                        SMB_BIG_UINT offset,
@@ -254,7 +263,8 @@ NTSTATUS do_unlock(files_struct *fsp,
                return NT_STATUS_NO_MEMORY;
        }
 
-       ok = brl_unlock(br_lck,
+       ok = brl_unlock(msg_ctx,
+                       br_lck,
                        lock_pid,
                        procid_self(),
                        offset,
@@ -268,6 +278,9 @@ NTSTATUS do_unlock(files_struct *fsp,
                return NT_STATUS_RANGE_NOT_LOCKED;
        }
 
+       SMB_ASSERT(fsp->current_lock_count > 0);
+       fsp->current_lock_count--;
+
        return NT_STATUS_OK;
 }
 
@@ -315,6 +328,9 @@ NTSTATUS do_lock_cancel(files_struct *fsp,
                return NT_STATUS_DOS(ERRDOS, ERRcancelviolation);
        }
 
+       SMB_ASSERT(fsp->current_lock_count > 0);
+       fsp->current_lock_count--;
+
        return NT_STATUS_OK;
 }
 
@@ -322,7 +338,8 @@ NTSTATUS do_lock_cancel(files_struct *fsp,
  Remove any locks on this fd. Called from file_close().
 ****************************************************************************/
 
-void locking_close_file(files_struct *fsp)
+void locking_close_file(struct messaging_context *msg_ctx,
+                       files_struct *fsp)
 {
        struct byte_range_lock *br_lck;
 
@@ -330,11 +347,19 @@ void locking_close_file(files_struct *fsp)
                return;
        }
 
+       /* If we have not outstanding locks or pending
+        * locks then we don't need to look in the lock db.
+        */
+
+       if (fsp->current_lock_count == 0) {
+               return;
+       }
+
        br_lck = brl_get_locks(NULL,fsp);
 
        if (br_lck) {
                cancel_pending_lock_requests_by_fid(fsp, br_lck);
-               brl_close_fnum(br_lck);
+               brl_close_fnum(msg_ctx, br_lck);
                TALLOC_FREE(br_lck);
        }
 }
@@ -413,7 +438,7 @@ static TDB_DATA locking_key(SMB_DEV_T dev, SMB_INO_T inode)
        memset(&key, '\0', sizeof(key));
        key.dev = dev;
        key.ino = inode;
-       kbuf.dptr = (char *)&key;
+       kbuf.dptr = (uint8 *)&key;
        kbuf.dsize = sizeof(key);
        return kbuf;
 }
@@ -501,7 +526,7 @@ static BOOL parse_share_modes(TDB_DATA dbuf, struct share_mode_lock *lck)
                }
                                  
                lck->share_modes = (struct share_mode_entry *)
-                       talloc_memdup(lck, dbuf.dptr+sizeof(*data),
+                       TALLOC_MEMDUP(lck, dbuf.dptr+sizeof(*data),
                                      lck->num_share_modes *
                                      sizeof(struct share_mode_entry));
 
@@ -512,7 +537,7 @@ static BOOL parse_share_modes(TDB_DATA dbuf, struct share_mode_lock *lck)
 
        /* Get any delete token. */
        if (data->u.s.delete_token_size) {
-               char *p = dbuf.dptr + sizeof(*data) +
+               uint8 *p = dbuf.dptr + sizeof(*data) +
                                (lck->num_share_modes *
                                sizeof(struct share_mode_entry));
 
@@ -558,7 +583,7 @@ static BOOL parse_share_modes(TDB_DATA dbuf, struct share_mode_lock *lck)
        }
 
        /* Save off the associated service path and filename. */
-       lck->servicepath = talloc_strdup(lck, dbuf.dptr + sizeof(*data) +
+       lck->servicepath = talloc_strdup(lck, (const char *)dbuf.dptr + sizeof(*data) +
                                        (lck->num_share_modes *
                                        sizeof(struct share_mode_entry)) +
                                        data->u.s.delete_token_size );
@@ -566,7 +591,7 @@ static BOOL parse_share_modes(TDB_DATA dbuf, struct share_mode_lock *lck)
                smb_panic("talloc_strdup failed\n");
        }
 
-       lck->filename = talloc_strdup(lck, dbuf.dptr + sizeof(*data) +
+       lck->filename = talloc_strdup(lck, (const char *)dbuf.dptr + sizeof(*data) +
                                        (lck->num_share_modes *
                                        sizeof(struct share_mode_entry)) +
                                        data->u.s.delete_token_size +
@@ -626,7 +651,7 @@ static TDB_DATA unparse_share_modes(struct share_mode_lock *lck)
                delete_token_size +
                sp_len + 1 +
                strlen(lck->filename) + 1;
-       result.dptr = TALLOC_ARRAY(lck, char, result.dsize);
+       result.dptr = TALLOC_ARRAY(lck, uint8, result.dsize);
 
        if (result.dptr == NULL) {
                smb_panic("talloc failed\n");
@@ -648,7 +673,7 @@ static TDB_DATA unparse_share_modes(struct share_mode_lock *lck)
 
        /* Store any delete on close token. */
        if (lck->delete_token) {
-               char *p = result.dptr + offset;
+               uint8 *p = result.dptr + offset;
 
                memcpy(p, &lck->delete_token->uid, sizeof(uid_t));
                p += sizeof(uid_t);
@@ -663,10 +688,10 @@ static TDB_DATA unparse_share_modes(struct share_mode_lock *lck)
                offset = p - result.dptr;
        }
 
-       safe_strcpy(result.dptr + offset, lck->servicepath,
+       safe_strcpy((char *)result.dptr + offset, lck->servicepath,
                    result.dsize - offset - 1);
        offset += sp_len + 1;
-       safe_strcpy(result.dptr + offset, lck->filename,
+       safe_strcpy((char *)result.dptr + offset, lck->filename,
                    result.dsize - offset - 1);
 
        if (DEBUGLEVEL >= 10) {
@@ -785,7 +810,8 @@ struct share_mode_lock *get_share_mode_lock(TALLOC_CTX *mem_ctx,
  Based on an initial code idea from SATOH Fumiyasu <fumiya@samba.gr.jp>
 ********************************************************************/
 
-BOOL rename_share_filename(struct share_mode_lock *lck,
+BOOL rename_share_filename(struct messaging_context *msg_ctx,
+                       struct share_mode_lock *lck,
                        const char *servicepath,
                        const char *newname)
 {
@@ -794,6 +820,7 @@ BOOL rename_share_filename(struct share_mode_lock *lck,
        size_t msg_len;
        char *frm = NULL;
        int i;
+       DATA_BLOB msg;
 
        if (!lck) {
                return False;
@@ -837,6 +864,8 @@ BOOL rename_share_filename(struct share_mode_lock *lck,
        safe_strcpy(&frm[16], lck->servicepath, sp_len);
        safe_strcpy(&frm[16 + sp_len + 1], lck->filename, fn_len);
 
+       msg = data_blob_const(frm, msg_len);
+
        /* Send the messages. */
        for (i=0; i<lck->num_share_modes; i++) {
                struct share_mode_entry *se = &lck->share_modes[i];
@@ -854,8 +883,7 @@ BOOL rename_share_filename(struct share_mode_lock *lck,
                        (unsigned int)lck->dev, (double)lck->ino,
                        lck->servicepath, lck->filename ));
 
-               message_send_pid(se->pid, MSG_SMB_FILE_RENAME,
-                               frm, msg_len, True);
+               messaging_send(msg_ctx, se->pid, MSG_SMB_FILE_RENAME, &msg);
        }
 
        return True;
@@ -1298,10 +1326,10 @@ static int traverse_fn(TDB_CONTEXT *the_tdb, TDB_DATA kbuf, TDB_DATA dbuf,
 
        data = (struct locking_data *)dbuf.dptr;
        shares = (struct share_mode_entry *)(dbuf.dptr + sizeof(*data));
-       sharepath = dbuf.dptr + sizeof(*data) +
+       sharepath = (const char *)dbuf.dptr + sizeof(*data) +
                data->u.s.num_share_mode_entries*sizeof(*shares) +
                data->u.s.delete_token_size;
-       fname = dbuf.dptr + sizeof(*data) +
+       fname = (const char *)dbuf.dptr + sizeof(*data) +
                data->u.s.num_share_mode_entries*sizeof(*shares) +
                data->u.s.delete_token_size +
                strlen(sharepath) + 1;