sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Make us pass all SMB2 lock tests except MULTIPLE-UNLOCK and CONTEXT. Them next :-).

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison 2010-05-07 01:20:26 -07:00
parent 882fb1828f
commit 4ad1943d29
8 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/include/proto.h
View File

@ -3473,7 +3473,8 @@ NTSTATUS do_lock_cancel(files_struct *fsp,
enum brl_flavour lock_flav, enum brl_flavour lock_flav,
struct blocking_lock_record *blr); struct blocking_lock_record *blr);
void locking_close_file(struct messaging_context *msg_ctx, void locking_close_file(struct messaging_context *msg_ctx,
files_struct *fsp); files_struct *fsp,
enum file_close_type close_type);
bool locking_init(void); bool locking_init(void);
bool locking_init_readonly(void); bool locking_init_readonly(void);
bool locking_end(void); bool locking_end(void);
@ -6002,7 +6003,9 @@ bool push_blocking_lock_request( struct byte_range_lock *br_lck,
uint64_t offset, uint64_t offset,
uint64_t count, uint64_t count,
uint32 blocking_pid); uint32 blocking_pid);
void cancel_pending_lock_requests_by_fid(files_struct *fsp, struct byte_range_lock *br_lck); void cancel_pending_lock_requests_by_fid(files_struct *fsp,
struct byte_range_lock *br_lck,
enum file_close_type close_type);
void remove_pending_lock_requests_by_mid_smb1(uint64_t mid); void remove_pending_lock_requests_by_mid_smb1(uint64_t mid);
bool blocking_lock_was_deferred_smb1(uint64_t mid); bool blocking_lock_was_deferred_smb1(uint64_t mid);
struct blocking_lock_record *blocking_lock_cancel_smb1(files_struct *fsp, struct blocking_lock_record *blocking_lock_cancel_smb1(files_struct *fsp,

4
source3/lib/dummysmbd.c
View File

@ -38,7 +38,9 @@ bool conn_snum_used(int snum)
return False; return False;
} }
void cancel_pending_lock_requests_by_fid(files_struct *fsp, struct byte_range_lock *br_lck) void cancel_pending_lock_requests_by_fid(files_struct *fsp,
struct byte_range_lock *br_lck,
enum file_close_type close_type)
{ {
} }

5
source3/locking/locking.c
View File

@ -396,7 +396,8 @@ NTSTATUS do_lock_cancel(files_struct *fsp,
****************************************************************************/ ****************************************************************************/
void locking_close_file(struct messaging_context *msg_ctx, void locking_close_file(struct messaging_context *msg_ctx,
files_struct *fsp) files_struct *fsp,
enum file_close_type close_type)
{ {
struct byte_range_lock *br_lck; struct byte_range_lock *br_lck;
@ -415,7 +416,7 @@ void locking_close_file(struct messaging_context *msg_ctx,
br_lck = brl_get_locks(talloc_tos(),fsp); br_lck = brl_get_locks(talloc_tos(),fsp);
if (br_lck) { if (br_lck) {
cancel_pending_lock_requests_by_fid(fsp, br_lck); cancel_pending_lock_requests_by_fid(fsp, br_lck, close_type);
brl_close_fnum(msg_ctx, br_lck); brl_close_fnum(msg_ctx, br_lck);
TALLOC_FREE(br_lck); TALLOC_FREE(br_lck);
} }

8
source3/smbd/blocking.c
View File

@ -571,13 +571,17 @@ static bool blocking_lock_record_process(struct blocking_lock_record *blr)
Called when a file is closed. Called when a file is closed.
*****************************************************************************/ *****************************************************************************/
void cancel_pending_lock_requests_by_fid(files_struct *fsp, struct byte_range_lock *br_lck) void cancel_pending_lock_requests_by_fid(files_struct *fsp,
struct byte_range_lock *br_lck,
enum file_close_type close_type)
{ {
struct smbd_server_connection *sconn = smbd_server_conn; struct smbd_server_connection *sconn = smbd_server_conn;
struct blocking_lock_record *blr, *blr_cancelled, *next = NULL; struct blocking_lock_record *blr, *blr_cancelled, *next = NULL;
if (sconn->allow_smb2) { if (sconn->allow_smb2) {
cancel_pending_lock_requests_by_fid_smb2(fsp, br_lck); cancel_pending_lock_requests_by_fid_smb2(fsp,
br_lck,
close_type);
return; return;
} }

2
source3/smbd/close.c
View File

@ -623,7 +623,7 @@ static NTSTATUS close_normal_file(struct smb_request *req, files_struct *fsp,
status = ntstatus_keeperror(status, tmp); status = ntstatus_keeperror(status, tmp);
} }
locking_close_file(smbd_messaging_context(), fsp); locking_close_file(smbd_messaging_context(), fsp, close_type);
tmp = fd_close(fsp); tmp = fd_close(fsp);
status = ntstatus_keeperror(status, tmp); status = ntstatus_keeperror(status, tmp);

3
source3/smbd/globals.h
View File

@ -320,7 +320,8 @@ bool push_blocking_lock_request_smb2( struct byte_range_lock *br_lck,
uint32_t blocking_pid); uint32_t blocking_pid);
void process_blocking_lock_queue_smb2(struct timeval tv_curr); void process_blocking_lock_queue_smb2(struct timeval tv_curr);
void cancel_pending_lock_requests_by_fid_smb2(files_struct *fsp, void cancel_pending_lock_requests_by_fid_smb2(files_struct *fsp,
struct byte_range_lock *br_lck); struct byte_range_lock *br_lck,
enum file_close_type close_type);
/* From smbd/smb2_create.c */ /* From smbd/smb2_create.c */
int map_smb2_oplock_levels_to_samba(uint8_t in_oplock_level); int map_smb2_oplock_levels_to_samba(uint8_t in_oplock_level);
uint8_t map_samba_oplock_levels_to_smb2(int oplock_type); uint8_t map_samba_oplock_levels_to_smb2(int oplock_type);

10
source3/smbd/smb2_lock.c
View File

@ -840,7 +840,8 @@ void process_blocking_lock_queue_smb2(struct timeval tv_curr)
****************************************************************************/ ****************************************************************************/
void cancel_pending_lock_requests_by_fid_smb2(files_struct *fsp, void cancel_pending_lock_requests_by_fid_smb2(files_struct *fsp,
struct byte_range_lock *br_lck) struct byte_range_lock *br_lck,
enum file_close_type close_type)
{ {
struct smbd_server_connection *sconn = smbd_server_conn; struct smbd_server_connection *sconn = smbd_server_conn;
struct smbd_smb2_request *smb2req, *nextreq; struct smbd_smb2_request *smb2req, *nextreq;
@ -904,6 +905,11 @@ void cancel_pending_lock_requests_by_fid_smb2(files_struct *fsp,
blr); blr);
/* Finally end the request. */ /* Finally end the request. */
tevent_req_nterror(smb2req->subreq, NT_STATUS_RANGE_NOT_LOCKED); if (close_type == SHUTDOWN_CLOSE) {
tevent_req_done(smb2req->subreq);
} else {
tevent_req_nterror(smb2req->subreq,
NT_STATUS_RANGE_NOT_LOCKED);
}
} }
} }

8
source3/smbd/smb2_server.c
View File

@ -1097,10 +1097,18 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
case SMB2_OP_LOCK: case SMB2_OP_LOCK:
if (!NT_STATUS_IS_OK(session_status)) { if (!NT_STATUS_IS_OK(session_status)) {
/* Too ugly to live ? JRA. */
if (NT_STATUS_EQUAL(session_status,NT_STATUS_USER_SESSION_DELETED)) {
session_status = NT_STATUS_FILE_CLOSED;
}
return smbd_smb2_request_error(req, session_status); return smbd_smb2_request_error(req, session_status);
} }
status = smbd_smb2_request_check_tcon(req); status = smbd_smb2_request_check_tcon(req);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
/* Too ugly to live ? JRA. */
if (NT_STATUS_EQUAL(status,NT_STATUS_NETWORK_NAME_DELETED)) {
status = NT_STATUS_FILE_CLOSED;
}
return smbd_smb2_request_error(req, status); return smbd_smb2_request_error(req, status);
} }
return smbd_smb2_request_process_lock(req); return smbd_smb2_request_process_lock(req);