sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

file_set_sparse needs to be a handle based call.

Browse Source
This commit is contained in:
Jeremy Allison 2010-12-16 16:42:33 -08:00
parent 192c4a145f
commit fe50632d54
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/include/proto.h
View File

@ -4621,7 +4621,7 @@ uint32 dos_mode(connection_struct *conn, struct smb_filename *smb_fname);
int file_set_dosmode(connection_struct *conn, struct smb_filename *smb_fname,
uint32 dosmode, const char *parent_dir, bool newfile);
NTSTATUS file_set_sparse(connection_struct *conn,
struct smb_filename *smb_fname,
struct files_struct *fsp,
bool sparse);
int file_ntimes(connection_struct *conn, const struct smb_filename *smb_fname,
struct smb_file_time *ft);

18
source3/smbd/dosmode.c
View File

@ -848,27 +848,26 @@ int file_set_dosmode(connection_struct *conn, struct smb_filename *smb_fname,
NTSTATUS file_set_sparse(connection_struct *conn,
struct smb_filename *smb_fname,
files_struct *fsp,
bool sparse)
{
SMB_STRUCT_STAT st;
uint32_t old_dosmode;
uint32_t new_dosmode;
NTSTATUS status;
DEBUG(10,("file_set_sparse: setting sparse bit %u on file %s\n",
sparse, smb_fname_str_dbg(smb_fname)));
sparse, smb_fname_str_dbg(fsp->fsp_name)));
if (!lp_store_dos_attributes(SNUM(conn))) {
return NT_STATUS_INVALID_DEVICE_REQUEST;
}
SET_STAT_INVALID(st);
if (SMB_VFS_STAT(conn, smb_fname)) {
return map_nt_error_from_unix(errno);
status = vfs_stat_fsp(fsp);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
old_dosmode = dos_mode(conn, smb_fname);
old_dosmode = dos_mode(conn, fsp->fsp_name);
if (sparse && !(old_dosmode & FILE_ATTRIBUTE_SPARSE)) {
new_dosmode = old_dosmode | FILE_ATTRIBUTE_SPARSE;
@ -879,7 +878,7 @@ NTSTATUS file_set_sparse(connection_struct *conn,
}
/* Store the DOS attributes in an EA. */
if (!set_ea_dos_attribute(conn, smb_fname,
if (!set_ea_dos_attribute(conn, fsp->fsp_name,
new_dosmode)) {
if (errno == 0) {
errno = EIO;
@ -894,7 +893,6 @@ NTSTATUS file_set_sparse(connection_struct *conn,
return NT_STATUS_OK;
}
/*******************************************************************
Wrapper around the VFS ntimes that possibly allows DOS semantics rather
than POSIX.

2
source3/smbd/nttrans.c
View File

@ -2140,7 +2140,7 @@ static void call_nt_transact_ioctl(connection_struct *conn,
return;
}
status = file_set_sparse(conn, fsp->fsp_name, set_sparse);
status = file_set_sparse(conn, fsp, set_sparse);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(9,("FSCTL_SET_SPARSE: fname[%s] set[%u] - %s\n",
smb_fname_str_dbg(fsp->fsp_name), set_sparse, nt_errstr(status)));