From a65bce4e38d0b940286c7c93c226651e5fb45082 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 25 Jan 2011 13:57:38 -0800 Subject: Add uint32_t name_hash argument (currently unused) to get_file_infos(). Will be used when we store more than one delete on close token. --- source3/smbd/dir.c | 2 +- source3/smbd/filename.c | 1 + source3/smbd/nttrans.c | 4 ++-- source3/smbd/reply.c | 4 ++-- source3/smbd/smb2_create.c | 2 +- source3/smbd/smb2_getinfo.c | 4 ++-- source3/smbd/trans2.c | 8 ++++---- 7 files changed, 13 insertions(+), 12 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index b49b89396c..7c9d6e262e 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -981,7 +981,7 @@ bool smbd_dirptr_get_entry(TALLOC_CTX *ctx, fileid = vfs_file_id_from_sbuf(conn, &smb_fname.st); - get_file_infos(fileid, NULL, &write_time_ts); + get_file_infos(fileid, 0, NULL, &write_time_ts); if (!null_timespec(write_time_ts)) { update_stat_ex_mtime(&smb_fname.st, write_time_ts); diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c index bd783232f6..1194660565 100644 --- a/source3/smbd/filename.c +++ b/source3/smbd/filename.c @@ -859,6 +859,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx, bool delete_pending; get_file_infos(vfs_file_id_from_sbuf(conn, &smb_fname->st), + 0, &delete_pending, NULL); if (delete_pending) { status = NT_STATUS_DELETE_PENDING; diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index 9d6a892ad6..b63f37f0fd 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -654,7 +654,7 @@ void reply_ntcreate_and_X(struct smb_request *req) /* Deal with other possible opens having a modified write time. JRA. */ ZERO_STRUCT(write_time_ts); - get_file_infos(fsp->file_id, NULL, &write_time_ts); + get_file_infos(fsp->file_id, 0, NULL, &write_time_ts); if (!null_timespec(write_time_ts)) { update_stat_ex_mtime(&smb_fname->st, write_time_ts); } @@ -1232,7 +1232,7 @@ static void call_nt_transact_create(connection_struct *conn, /* Deal with other possible opens having a modified write time. JRA. */ ZERO_STRUCT(write_time_ts); - get_file_infos(fsp->file_id, NULL, &write_time_ts); + get_file_infos(fsp->file_id, 0, NULL, &write_time_ts); if (!null_timespec(write_time_ts)) { update_stat_ex_mtime(&smb_fname->st, write_time_ts); } diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 92be257029..4d3be85a85 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -1141,7 +1141,7 @@ void reply_getatr(struct smb_request *req) ZERO_STRUCT(write_time_ts); fileid = vfs_file_id_from_sbuf(conn, &smb_fname->st); - get_file_infos(fileid, NULL, &write_time_ts); + get_file_infos(fileid, 0, NULL, &write_time_ts); if (!null_timespec(write_time_ts)) { update_stat_ex_mtime(&smb_fname->st, write_time_ts); } @@ -1803,7 +1803,7 @@ void reply_open(struct smb_request *req) struct timespec write_time_ts; ZERO_STRUCT(write_time_ts); - get_file_infos(fsp->file_id, NULL, &write_time_ts); + get_file_infos(fsp->file_id, 0, NULL, &write_time_ts); if (!null_timespec(write_time_ts)) { update_stat_ex_mtime(&smb_fname->st, write_time_ts); } diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c index 71e97a4040..b191b74fcc 100644 --- a/source3/smbd/smb2_create.c +++ b/source3/smbd/smb2_create.c @@ -797,7 +797,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx, /* Deal with other possible opens having a modified write time. JRA. */ ZERO_STRUCT(write_time_ts); - get_file_infos(result->file_id, NULL, &write_time_ts); + get_file_infos(result->file_id, 0, NULL, &write_time_ts); if (!null_timespec(write_time_ts)) { update_stat_ex_mtime(&result->fsp_name->st, write_time_ts); } diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c index 09234cd129..0ff659346e 100644 --- a/source3/smbd/smb2_getinfo.c +++ b/source3/smbd/smb2_getinfo.c @@ -320,7 +320,7 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx, fileid = vfs_file_id_from_sbuf(conn, &fsp->fsp_name->st); - get_file_infos(fileid, &delete_pending, &write_time_ts); + get_file_infos(fileid, 0, &delete_pending, &write_time_ts); } else { /* * Original code - this is an open file. @@ -336,7 +336,7 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx, } fileid = vfs_file_id_from_sbuf(conn, &fsp->fsp_name->st); - get_file_infos(fileid, &delete_pending, &write_time_ts); + get_file_infos(fileid, 0, &delete_pending, &write_time_ts); } status = smbd_do_qfilepathinfo(conn, state, diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 90a878d17e..60664fd229 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -5103,7 +5103,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn, } fileid = vfs_file_id_from_sbuf(conn, &smb_fname->st); - get_file_infos(fileid, &delete_pending, &write_time_ts); + get_file_infos(fileid, 0, &delete_pending, &write_time_ts); } else { /* * Original code - this is an open file. @@ -5120,7 +5120,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn, return; } fileid = vfs_file_id_from_sbuf(conn, &smb_fname->st); - get_file_infos(fileid, &delete_pending, &write_time_ts); + get_file_infos(fileid, 0, &delete_pending, &write_time_ts); } } else { @@ -5213,7 +5213,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn, fileid = vfs_file_id_from_sbuf(conn, &smb_fname_base->st); TALLOC_FREE(smb_fname_base); - get_file_infos(fileid, &delete_pending, NULL); + get_file_infos(fileid, 0, &delete_pending, NULL); if (delete_pending) { reply_nterror(req, NT_STATUS_DELETE_PENDING); return; @@ -5245,7 +5245,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn, } fileid = vfs_file_id_from_sbuf(conn, &smb_fname->st); - get_file_infos(fileid, &delete_pending, &write_time_ts); + get_file_infos(fileid, 0, &delete_pending, &write_time_ts); if (delete_pending) { reply_nterror(req, NT_STATUS_DELETE_PENDING); return; -- cgit