smbpid needs to be 32 bit now to cope with SMB2

diff --git a/source/ntvfs/common/brlock.c b/source/ntvfs/common/brlock.c
index c87eca8aff3371da5d389c7188c2ca6719ac19da..3b3487315206bd77ececa84560abac59bb2791f1 100644 (file)
--- a/source/ntvfs/common/brlock.c
+++ b/source/ntvfs/common/brlock.c
@@ -109,7 +109,7 @@ NTSTATUS brl_remove_pending(struct brl_context *brl,
 */
 NTSTATUS brl_locktest(struct brl_context *brl,
                      struct brl_handle *brlh,
 */
 NTSTATUS brl_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)
 {
                      uint64_t start, uint64_t size, 
                      enum brl_type lock_type)
 {

diff --git a/source/ntvfs/common/brlock_tdb.c b/source/ntvfs/common/brlock_tdb.c
index 362a6d01e24d6c24af0d5de59a89c2cfcacdca2e..c94b9b446e67c19d54caae2a76b41a8b707f91ef 100644 (file)
--- a/source/ntvfs/common/brlock_tdb.c
+++ b/source/ntvfs/common/brlock_tdb.c
@@ -57,7 +57,7 @@ struct brl_context {
 */
 struct lock_context {
        struct server_id server;
 */
 struct lock_context {
        struct server_id server;

-       uint16_t smbpid;
+       uint32_t smbpid;

        struct brl_context *ctx;
 };
 
        struct brl_context *ctx;
 };
 


@@ -286,7 +286,7 @@ static NTSTATUS brl_tdb_lock_failed(struct brl_handle *brlh, struct lock_struct
 */
 static NTSTATUS brl_tdb_lock(struct brl_context *brl,
                         struct brl_handle *brlh,
 */
 static NTSTATUS brl_tdb_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)
                         uint64_t start, uint64_t size, 
                         enum brl_type lock_type,
                         void *notify_ptr)


@@ -436,7 +436,7 @@ static void brl_tdb_notify_all(struct brl_context *brl,
 */
 static NTSTATUS brl_tdb_unlock(struct brl_context *brl,
                           struct brl_handle *brlh, 
 */
 static NTSTATUS brl_tdb_unlock(struct brl_context *brl,
                           struct brl_handle *brlh, 

-                          uint16_t smbpid,
+                          uint32_t smbpid,

                           uint64_t start, uint64_t size)
 {
        TDB_DATA kbuf, dbuf;
                           uint64_t start, uint64_t size)
 {
        TDB_DATA kbuf, dbuf;


@@ -581,7 +581,7 @@ static NTSTATUS brl_tdb_remove_pending(struct brl_context *brl,
 */
 static NTSTATUS brl_tdb_locktest(struct brl_context *brl,
                             struct brl_handle *brlh,
 */
 static NTSTATUS brl_tdb_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)
 {
                             uint64_t start, uint64_t size, 
                             enum brl_type lock_type)
 {