sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-06 13:18:07 +03:00
Code

s3: locking: Move two leases functions into a new file.

Browse Source 
map_oplock_to_lease_type(), fsp_lease_type().

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12628

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
(back ported from commit 125c78ad0b)
This commit is contained in:
Jeremy Allison 2017-03-14 13:23:13 -07:00 committed by Karolin Seeger
parent 7086fb6a4d
commit 419f5cca88
6 changed files with 65 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
source3/locking/leases_util.c Normal file
View File

@ -0,0 +1,55 @@
/*
Unix SMB/CIFS implementation.
Lease utility functions
Copyright (C) Jeremy Allison 2017.
Copyright (C) Stefan (metze) Metzmacher 2017.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define DBGC_CLASS DBGC_LOCKING
#include "includes.h"
#include "../librpc/gen_ndr/open_files.h"
#include "locking/proto.h"
uint32_t map_oplock_to_lease_type(uint16_t op_type)
{
uint32_t ret;
switch(op_type) {
case BATCH_OPLOCK:
case BATCH_OPLOCK|EXCLUSIVE_OPLOCK:
ret = SMB2_LEASE_READ|SMB2_LEASE_WRITE|SMB2_LEASE_HANDLE;
break;
case EXCLUSIVE_OPLOCK:
ret = SMB2_LEASE_READ|SMB2_LEASE_WRITE;
break;
case LEVEL_II_OPLOCK:
ret = SMB2_LEASE_READ;
break;
default:
ret = SMB2_LEASE_NONE;
break;
}
return ret;
}
uint32_t fsp_lease_type(struct files_struct *fsp)
{
if (fsp->oplock_type == LEASE_OPLOCK) {
return fsp->lease->lease.lease_state;
}
return map_oplock_to_lease_type(fsp->oplock_type);
}

4
source3/locking/proto.h
View File

@ -247,4 +247,8 @@ bool release_posix_lock_posix_flavour(files_struct *fsp,
const struct lock_struct *plocks,
int num_locks);
/* The following definitions come from locking/leases_util.c */
uint32_t map_oplock_to_lease_type(uint16_t op_type);
uint32_t fsp_lease_type(struct files_struct *fsp);
#endif /* _LOCKING_PROTO_H_ */

8
source3/smbd/files.c
View File

@ -773,11 +773,3 @@ const struct GUID *fsp_client_guid(const files_struct *fsp)
{
return &fsp->conn->sconn->client->connections->smb2.client.guid;
}
uint32_t fsp_lease_type(struct files_struct *fsp)
{
if (fsp->oplock_type == LEASE_OPLOCK) {
return fsp->lease->lease.lease_state;
}
return map_oplock_to_lease_type(fsp->oplock_type);
}

22
source3/smbd/oplock.c
View File

@ -149,28 +149,6 @@ static void downgrade_file_oplock(files_struct *fsp)
TALLOC_FREE(fsp->oplock_timeout);
}
uint32_t map_oplock_to_lease_type(uint16_t op_type)
{
uint32_t ret;
switch(op_type) {
case BATCH_OPLOCK:
case BATCH_OPLOCK|EXCLUSIVE_OPLOCK:
ret = SMB2_LEASE_READ|SMB2_LEASE_WRITE|SMB2_LEASE_HANDLE;
break;
case EXCLUSIVE_OPLOCK:
ret = SMB2_LEASE_READ|SMB2_LEASE_WRITE;
break;
case LEVEL_II_OPLOCK:
ret = SMB2_LEASE_READ;
break;
default:
ret = SMB2_LEASE_NONE;
break;
}
return ret;
}
uint32_t get_lease_type(const struct share_mode_data *d,
const struct share_mode_entry *e)
{

2
source3/smbd/proto.h
View File

@ -395,7 +395,6 @@ NTSTATUS file_name_hash(connection_struct *conn,
NTSTATUS fsp_set_smb_fname(struct files_struct *fsp,
const struct smb_filename *smb_fname_in);
const struct GUID *fsp_client_guid(const files_struct *fsp);
uint32_t fsp_lease_type(struct files_struct *fsp);
/* The following definitions come from smbd/ipc.c */
@ -678,7 +677,6 @@ NTSTATUS get_relative_fid_filename(connection_struct *conn,
/* The following definitions come from smbd/oplock.c */
uint32_t map_oplock_to_lease_type(uint16_t op_type);
uint32_t get_lease_type(const struct share_mode_data *d,
const struct share_mode_entry *e);
bool update_num_read_oplocks(files_struct *fsp, struct share_mode_lock *lck);

6
source3/wscript_build
View File

@ -625,6 +625,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
RPC_SERVICE
NDR_SMBXSRV
LEASES_DB
LEASES_UTIL
LIBASYS
sysquotas
NDR_SMB_ACL
@ -646,6 +647,7 @@ bld.SAMBA3_SUBSYSTEM('LOCKING',
tdb
talloc
LEASES_DB
LEASES_UTIL
NDR_OPEN_FILES
FNAME_UTIL''')
@ -653,6 +655,10 @@ bld.SAMBA3_SUBSYSTEM('LEASES_DB',
source='locking/leases_db.c',
deps='NDR_LEASES_DB')
bld.SAMBA3_SUBSYSTEM('LEASES_UTIL',
source='locking/leases_util.c',
deps='NDR_OPEN_FILES')
if bld.CONFIG_GET("WITH_PROFILE"):
bld.SAMBA3_SUBSYSTEM('PROFILE',
source='profile/profile.c',