s3:locking: init_strict_lock_struct() already calls lp_posix_cifsu_locktype()

There is no need to do it in the caller and pass an unused argument.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index dd963e4fbaadd00d30fbda6175c1a615b1047720..fefbf88f20a76ad92c81c913fb4195d44a548e86 100644 (file)
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -91,7 +91,6 @@ void init_strict_lock_struct(files_struct *fsp,
                                br_off start,
                                br_off size,
                                enum brl_type lock_type,
-                               enum brl_flavour lock_flav,
                                struct lock_struct *plock)
 {
        SMB_ASSERT(lock_type == READ_LOCK || lock_type == WRITE_LOCK);

diff --git a/source3/locking/proto.h b/source3/locking/proto.h
index 8e03ad8cf5a1f338fdc28bf9b186f1f77f9aab15..adfe5fede8f933c3f7a8cf09e2ca94a5bc674cb3 100644 (file)
--- a/source3/locking/proto.h
+++ b/source3/locking/proto.h
@@ -98,7 +98,6 @@ void init_strict_lock_struct(files_struct *fsp,
                                br_off start,
                                br_off size,
                                enum brl_type lock_type,
-                               enum brl_flavour lock_flav,
                                struct lock_struct *plock);
 bool strict_lock_check_default(files_struct *fsp,
                               struct lock_struct *plock);

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 5d16cbb5bf32253d3750ed9c9ff38284e65ace07..d0cdffa790ae2b334c64bbd8f17ff9a15d01bc49 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -2337,7 +2337,6 @@ static NTSTATUS vfswrap_offload_fast_copy(struct tevent_req *req, int fsctl)
                                state->src_off,
                                state->remaining,
                                READ_LOCK,
-                               lp_posix_cifsu_locktype(state->src_fsp),
                                &lck);
 
        ok = SMB_VFS_STRICT_LOCK_CHECK(state->src_fsp->conn,
@@ -2357,7 +2356,6 @@ static NTSTATUS vfswrap_offload_fast_copy(struct tevent_req *req, int fsctl)
                                state->dst_off,
                                state->remaining,
                                WRITE_LOCK,
-                               lp_posix_cifsu_locktype(state->dst_fsp),
                                &lck);
 
        ok = SMB_VFS_STRICT_LOCK_CHECK(state->dst_fsp->conn,
@@ -2453,7 +2451,6 @@ static NTSTATUS vfswrap_offload_write_loop(struct tevent_req *req)
                                state->src_off,
                                state->next_io_size,
                                READ_LOCK,
-                               lp_posix_cifsu_locktype(state->src_fsp),
                                &read_lck);
 
        ok = SMB_VFS_STRICT_LOCK_CHECK(state->src_fsp->conn,
@@ -2517,7 +2514,6 @@ static void vfswrap_offload_write_read_done(struct tevent_req *subreq)
                                state->dst_off,
                                state->next_io_size,
                                WRITE_LOCK,
-                               lp_posix_cifsu_locktype(state->dst_fsp),
                                &write_lck);
 
        ok = SMB_VFS_STRICT_LOCK_CHECK(state->dst_fsp->conn,

diff --git a/source3/smbd/smb1_aio.c b/source3/smbd/smb1_aio.c
index d54a37273120047fa198a1e18234df6f799cab96..a242c4112aad4c30a3e9cfcc2a8e968f79734528 100644 (file)
--- a/source3/smbd/smb1_aio.c
+++ b/source3/smbd/smb1_aio.c
@@ -86,7 +86,6 @@ NTSTATUS schedule_aio_read_and_X(connection_struct *conn,
                        (uint64_t)startpos,
                        (uint64_t)smb_maxcnt,
                        READ_LOCK,
-                       lp_posix_cifsu_locktype(fsp),
                        &aio_ex->lock);
 
        /* Take the lock until the AIO completes. */
@@ -250,7 +249,6 @@ NTSTATUS schedule_aio_write_and_X(connection_struct *conn,
                        (uint64_t)startpos,
                        (uint64_t)numtowrite,
                        WRITE_LOCK,
-                       lp_posix_cifsu_locktype(fsp),
                        &aio_ex->lock);
 
        /* Take the lock until the AIO completes. */

diff --git a/source3/smbd/smb1_reply.c b/source3/smbd/smb1_reply.c
index d3f08a53706fa77d68bc6b926ba78f16b1066547..bcfdf96c633071f58d667cb486c2cb41391de0f3 100644 (file)
--- a/source3/smbd/smb1_reply.c
+++ b/source3/smbd/smb1_reply.c
@@ -3098,7 +3098,6 @@ void reply_readbraw(struct smb_request *req)
                        (uint64_t)startpos,
                        (uint64_t)maxcount,
                        READ_LOCK,
-                       lp_posix_cifsu_locktype(fsp),
                        &lock);
 
        if (!SMB_VFS_STRICT_LOCK_CHECK(conn, fsp, &lock)) {
@@ -3368,7 +3367,6 @@ Returning short read of maximum allowed for compatibility with Windows 2000.\n",
                        (uint64_t)startpos,
                        (uint64_t)numtoread,
                        READ_LOCK,
-                       lp_posix_cifsu_locktype(fsp),
                        &lock);
 
        if (!SMB_VFS_STRICT_LOCK_CHECK(conn, fsp, &lock)) {
@@ -3449,7 +3447,6 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req,
                        (uint64_t)startpos,
                        (uint64_t)smb_maxcnt,
                        READ_LOCK,
-                       lp_posix_cifsu_locktype(fsp),
                        &lock);
 
        if (!SMB_VFS_STRICT_LOCK_CHECK(conn, fsp, &lock)) {
@@ -3975,7 +3972,6 @@ void reply_writebraw(struct smb_request *req)
                                (uint64_t)startpos,
                                (uint64_t)tcount,
                                WRITE_LOCK,
-                               lp_posix_cifsu_locktype(fsp),
                                &lock);
 
                if (!SMB_VFS_STRICT_LOCK_CHECK(conn, fsp, &lock)) {
@@ -4195,7 +4191,6 @@ void reply_writeunlock(struct smb_request *req)
                                (uint64_t)startpos,
                                (uint64_t)numtowrite,
                                WRITE_LOCK,
-                               lp_posix_cifsu_locktype(fsp),
                                &lock);
 
                if (!SMB_VFS_STRICT_LOCK_CHECK(conn, fsp, &lock)) {
@@ -4331,7 +4326,6 @@ void reply_write(struct smb_request *req)
                                (uint64_t)startpos,
                                (uint64_t)numtowrite,
                                WRITE_LOCK,
-                               lp_posix_cifsu_locktype(fsp),
                                &lock);
 
                if (!SMB_VFS_STRICT_LOCK_CHECK(conn, fsp, &lock)) {
@@ -4632,7 +4626,6 @@ void reply_write_and_X(struct smb_request *req)
                                (uint64_t)startpos,
                                (uint64_t)numtowrite,
                                WRITE_LOCK,
-                               lp_posix_cifsu_locktype(fsp),
                                &lock);
 
                if (!SMB_VFS_STRICT_LOCK_CHECK(conn, fsp, &lock)) {
@@ -5341,7 +5334,6 @@ void reply_writeclose(struct smb_request *req)
                                (uint64_t)startpos,
                                (uint64_t)numtowrite,
                                WRITE_LOCK,
-                               lp_posix_cifsu_locktype(fsp),
                                &lock);
 
                if (!SMB_VFS_STRICT_LOCK_CHECK(conn, fsp, &lock)) {

diff --git a/source3/smbd/smb2_aio.c b/source3/smbd/smb2_aio.c
index fc97bdc075abd17451a1b80b5465c2ab587b7866..85e17ab551b9a2f443aa7fa38217fc491a31e374 100644 (file)
--- a/source3/smbd/smb2_aio.c
+++ b/source3/smbd/smb2_aio.c
@@ -368,7 +368,6 @@ NTSTATUS schedule_smb2_aio_read(connection_struct *conn,
                        (uint64_t)startpos,
                        (uint64_t)smb_maxcnt,
                        READ_LOCK,
-                       lp_posix_cifsu_locktype(fsp),
                        &aio_ex->lock);
 
        /* Take the lock until the AIO completes. */
@@ -517,7 +516,6 @@ NTSTATUS schedule_aio_smb2_write(connection_struct *conn,
                        in_offset,
                        (uint64_t)in_data.length,
                        WRITE_LOCK,
-                       lp_posix_cifsu_locktype(fsp),
                        &aio_ex->lock);
 
        /* Take the lock until the AIO completes. */

diff --git a/source3/smbd/smb2_ioctl_filesys.c b/source3/smbd/smb2_ioctl_filesys.c
index 1a8d1c2affa057f65b3056395815a8b3f1ccc44b..1fa0eea632af1a4e7a9b90af4a84615584d31aa9 100644 (file)
--- a/source3/smbd/smb2_ioctl_filesys.c
+++ b/source3/smbd/smb2_ioctl_filesys.c
@@ -460,7 +460,6 @@ static NTSTATUS fsctl_zero_data(TALLOC_CTX *mem_ctx,
                                zdata_info.file_off,
                                len,
                                WRITE_LOCK,
-                               lp_posix_cifsu_locktype(fsp),
                                &lck);
 
        if (!SMB_VFS_STRICT_LOCK_CHECK(fsp->conn, fsp, &lck)) {

diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index fc207850c91a92522c83a1a87d48627a6d91e652..3affa8a3317b42dbbd3ce0d0ab945754e82d5267 100644 (file)
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -579,7 +579,6 @@ static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
                                in_offset,
                                in_length,
                                READ_LOCK,
-                               lp_posix_cifsu_locktype(fsp),
                                &lock);
 
        if (!SMB_VFS_STRICT_LOCK_CHECK(conn, fsp, &lock)) {

diff --git a/source3/smbd/smb2_write.c b/source3/smbd/smb2_write.c
index 87f6640a0857030cfde2b102bfadb08f9555fdf9..2c26f838571443b126747af14d1978cb13bd0ad0 100644 (file)
--- a/source3/smbd/smb2_write.c
+++ b/source3/smbd/smb2_write.c
@@ -387,7 +387,6 @@ static struct tevent_req *smbd_smb2_write_send(TALLOC_CTX *mem_ctx,
                                in_offset,
                                in_data.length,
                                WRITE_LOCK,
-                               lp_posix_cifsu_locktype(fsp),
                                &lock);
 
        if (!SMB_VFS_STRICT_LOCK_CHECK(conn, fsp, &lock)) {