Change uint_t to unsigned int in source4

[garming/samba-autobuild/.git] / source4 / ntvfs / ntvfs_generic.c

diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index 3319539b63d5361844aacbf4faff120bcfe6be62..547d038738fdc3c047a5338cf1f4371646d9ac79 100644 (file)
--- a/source4/ntvfs/ntvfs_generic.c
+++ b/source4/ntvfs/ntvfs_generic.c
@@ -148,7 +148,7 @@ static NTSTATUS ntvfs_map_open_finish(struct ntvfs_module_context *ntvfs,
        time_t write_time = 0;
        uint32_t set_size = 0;
        union smb_setfileinfo *sf;
-       uint_t state;
+       unsigned int state;
 
        if (!NT_STATUS_IS_OK(status)) {
                return status;
@@ -579,7 +579,7 @@ static NTSTATUS ntvfs_map_fsinfo_finish(struct ntvfs_module_context *ntvfs,
 
        case RAW_QFS_DSKATTR: {
                /* map from generic to DSKATTR */
-               uint_t bpunit = 64;
+               unsigned int bpunit = 64;
 
                /* we need to scale the sizes to fit */
                for (bpunit=64; bpunit<0x10000; bpunit *= 2) {
@@ -1116,7 +1116,8 @@ NTSTATUS ntvfs_map_lock(struct ntvfs_module_context *ntvfs,
                        isunlock = false;
                }
                for (i=0;i<lck->smb2.in.lock_count;i++) {
-                       if (lck->smb2.in.locks[i].flags == SMB2_LOCK_FLAG_NONE) {
+                       if (!isunlock &&
+                           lck->smb2.in.locks[i].flags == SMB2_LOCK_FLAG_NONE) {
                                return NT_STATUS_INVALID_PARAMETER;
                        }
 
@@ -1186,7 +1187,7 @@ static NTSTATUS ntvfs_map_write_finish(struct ntvfs_module_context *ntvfs,
 {
        union smb_lock *lck;
        union smb_close *cl;
-       uint_t state;
+       unsigned int state;
 
        if (NT_STATUS_IS_ERR(status)) {
                return status;
@@ -1380,7 +1381,7 @@ NTSTATUS ntvfs_map_read(struct ntvfs_module_context *ntvfs,
        union smb_read *rd2;
        union smb_lock *lck;
        NTSTATUS status;
-       uint_t state;
+       unsigned int state;
 
        rd2 = talloc(req, union smb_read);
        if (rd2 == NULL) {