Use 32-bit smbpid in interface as required by SMB2, in line with

1bdd08227e7d046305705050f21f0f1b6dd6994a.

diff --git a/source4/cluster/ctdb/brlock_ctdb.c b/source4/cluster/ctdb/brlock_ctdb.c
index 01d60901a6e5d98f4afcd7f7dcef87966df2fd3b..1cc6beb78983a2ef7c9cdda5a435a545633817ea 100644 (file)
--- a/source4/cluster/ctdb/brlock_ctdb.c
+++ b/source4/cluster/ctdb/brlock_ctdb.c
@@ -378,7 +378,7 @@ reply:
 */
 static NTSTATUS brl_ctdb_lock(struct brl_context *brl,
                              struct brl_handle *brlh,
-                             uint16_t smbpid,
+                             uint32_t smbpid,
                              uint64_t start, uint64_t size, 
                              enum brl_type lock_type,
                              void *notify_ptr)
@@ -609,7 +609,7 @@ found:
 */
 static NTSTATUS brl_ctdb_unlock(struct brl_context *brl,
                                struct brl_handle *brlh, 
-                               uint16_t smbpid,
+                               uint32_t smbpid,
                                uint64_t start, uint64_t size)
 {
        struct ctdb_call call;
@@ -782,7 +782,7 @@ static int brl_ctdb_locktest_func(struct ctdb_call_info *call)
 */
 static NTSTATUS brl_ctdb_locktest(struct brl_context *brl,
                                  struct brl_handle *brlh,
-                                 uint16_t smbpid, 
+                                 uint32_t smbpid, 
                                  uint64_t start, uint64_t size, 
                                  enum brl_type lock_type)
 {

diff --git a/source4/ntvfs/common/brlock.c b/source4/ntvfs/common/brlock.c
index 21670bbea5dc32917d6d416fcd35b5674c662c32..a5bc5c1db4de2df030ad66cf234fc0bfa3ccc080 100644 (file)
--- a/source4/ntvfs/common/brlock.c
+++ b/source4/ntvfs/common/brlock.c
@@ -71,7 +71,7 @@ struct brl_handle *brl_create_handle(TALLOC_CTX *mem_ctx, struct ntvfs_handle *n
 */
 NTSTATUS brl_lock(struct brl_context *brl,
                  struct brl_handle *brlh,
-                 uint16_t smbpid,
+                 uint32_t smbpid,
                  uint64_t start, uint64_t size, 
                  enum brl_type lock_type,
                  void *notify_ptr)
@@ -85,7 +85,7 @@ NTSTATUS brl_lock(struct brl_context *brl,
 */
 NTSTATUS brl_unlock(struct brl_context *brl,
                    struct brl_handle *brlh, 
-                   uint16_t smbpid,
+                   uint32_t smbpid,
                    uint64_t start, uint64_t size)
 {
        return ops->brl_unlock(brl, brlh, smbpid, start, size);

diff --git a/source4/ntvfs/common/brlock.h b/source4/ntvfs/common/brlock.h
index aff30d138e1fc7aea97726702b542659c9c87245..75f142b6f67091170438f7cf74f427414d2928d4 100644 (file)
--- a/source4/ntvfs/common/brlock.h
+++ b/source4/ntvfs/common/brlock.h
@@ -28,20 +28,20 @@ struct brlock_ops {
        struct brl_handle *(*brl_create_handle)(TALLOC_CTX *, struct ntvfs_handle *, DATA_BLOB *);
        NTSTATUS (*brl_lock)(struct brl_context *,
                             struct brl_handle *,
-                            uint16_t ,
+                            uint32_t ,
                             uint64_t , uint64_t , 
                             enum brl_type ,
                             void *);
        NTSTATUS (*brl_unlock)(struct brl_context *,
                               struct brl_handle *, 
-                              uint16_t ,
+                              uint32_t ,
                               uint64_t , uint64_t );
        NTSTATUS (*brl_remove_pending)(struct brl_context *,
                                       struct brl_handle *, 
                                       void *);
        NTSTATUS (*brl_locktest)(struct brl_context *,
                                 struct brl_handle *,
-                                uint16_t , 
+                                uint32_t , 
                                 uint64_t , uint64_t , 
                                 enum brl_type );
        NTSTATUS (*brl_close)(struct brl_context *,