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

Rever 83ff6979f5 - "Fix the logic bug that caused us to

Browse Source 
run into kernel oplocks on an open for a stream inside a file with stream_xattr module. On
opening the base_fsp we must break existing oplocks." as it broke make test.
Jeremy.
This commit is contained in:
Jeremy Allison 2008-11-21 22:48:37 -08:00
parent 83ff6979f5
commit 338303eb37
2 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
source3/modules/vfs_streams_xattr.c
View File

@ -102,7 +102,7 @@ static int streams_xattr_fstat(vfs_handle_struct *handle, files_struct *fsp,
return -1;
}
sbuf->st_size = get_xattr_size(handle->conn, fsp,
sbuf->st_size = get_xattr_size(handle->conn, fsp->base_fsp,
io->base, io->xattr_name);
if (sbuf->st_size == -1) {
return -1;
@ -249,29 +249,29 @@ static int streams_xattr_open(vfs_handle_struct *handle, const char *fname,
/*
* We use baseflags to turn off nasty side-effects when opening the
* underlying file.
*/
baseflags = flags;
baseflags &= ~O_TRUNC;
baseflags &= ~O_EXCL;
baseflags &= ~O_CREAT;
*/
baseflags = flags;
baseflags &= ~O_TRUNC;
baseflags &= ~O_EXCL;
baseflags &= ~O_CREAT;
hostfd = SMB_VFS_OPEN(handle->conn, base, fsp, baseflags, mode);
hostfd = SMB_VFS_OPEN(handle->conn, base, fsp, baseflags, mode);
/* It is legit to open a stream on a directory, but the base
* fd has to be read-only.
*/
if ((hostfd == -1) && (errno == EISDIR)) {
baseflags &= ~O_ACCMODE;
baseflags |= O_RDONLY;
hostfd = SMB_VFS_OPEN(handle->conn, fname, fsp, baseflags,
mode);
}
/* It is legit to open a stream on a directory, but the base
* fd has to be read-only.
*/
if ((hostfd == -1) && (errno == EISDIR)) {
baseflags &= ~O_ACCMODE;
baseflags |= O_RDONLY;
hostfd = SMB_VFS_OPEN(handle->conn, fname, fsp, baseflags,
mode);
}
if (hostfd == -1) {
if (hostfd == -1) {
goto fail;
}
}
status = get_ea_value(talloc_tos(), handle->conn, fsp, base,
status = get_ea_value(talloc_tos(), handle->conn, NULL, base,
xattr_name, &ea);
DEBUG(10, ("get_ea_value returned %s\n", nt_errstr(status)));
@ -303,9 +303,9 @@ static int streams_xattr_open(vfs_handle_struct *handle, const char *fname,
DEBUG(10, ("creating attribute %s on file %s\n",
xattr_name, base));
if (fsp->fh->fd != -1) {
if (fsp->base_fsp->fh->fd != -1) {
if (SMB_VFS_FSETXATTR(
fsp, xattr_name,
fsp->base_fsp, xattr_name,
&null, sizeof(null),
flags & O_EXCL ? XATTR_CREATE : 0) == -1) {
goto fail;
@ -323,9 +323,9 @@ static int streams_xattr_open(vfs_handle_struct *handle, const char *fname,
if (flags & O_TRUNC) {
char null = '\0';
if (fsp->fh->fd != -1) {
if (fsp->base_fsp->fh->fd != -1) {
if (SMB_VFS_FSETXATTR(
fsp, xattr_name,
fsp->base_fsp, xattr_name,
&null, sizeof(null),
flags & O_EXCL ? XATTR_CREATE : 0) == -1) {
goto fail;
@ -600,7 +600,7 @@ static ssize_t streams_xattr_pwrite(vfs_handle_struct *handle,
return SMB_VFS_NEXT_PWRITE(handle, fsp, data, n, offset);
}
status = get_ea_value(talloc_tos(), handle->conn, fsp,
status = get_ea_value(talloc_tos(), handle->conn, fsp->base_fsp,
sio->base, sio->xattr_name, &ea);
if (!NT_STATUS_IS_OK(status)) {
return -1;
@ -624,12 +624,12 @@ static ssize_t streams_xattr_pwrite(vfs_handle_struct *handle,
memcpy(ea.value.data + offset, data, n);
if (fsp->fh->fd != -1) {
ret = SMB_VFS_FSETXATTR(fsp,
if (fsp->base_fsp->fh->fd != -1) {
ret = SMB_VFS_FSETXATTR(fsp->base_fsp,
sio->xattr_name,
ea.value.data, ea.value.length, 0);
} else {
ret = SMB_VFS_SETXATTR(fsp->conn, sio->base,
ret = SMB_VFS_SETXATTR(fsp->conn, fsp->base_fsp->fsp_name,
sio->xattr_name,
ea.value.data, ea.value.length, 0);
}
@ -656,7 +656,7 @@ static ssize_t streams_xattr_pread(vfs_handle_struct *handle,
return SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);
}
status = get_ea_value(talloc_tos(), handle->conn, fsp,
status = get_ea_value(talloc_tos(), handle->conn, fsp->base_fsp,
sio->base, sio->xattr_name, &ea);
if (!NT_STATUS_IS_OK(status)) {
return -1;
@ -696,7 +696,7 @@ static int streams_xattr_ftruncate(struct vfs_handle_struct *handle,
return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, offset);
}
status = get_ea_value(talloc_tos(), handle->conn, fsp,
status = get_ea_value(talloc_tos(), handle->conn, fsp->base_fsp,
sio->base, sio->xattr_name, &ea);
if (!NT_STATUS_IS_OK(status)) {
return -1;
@ -721,12 +721,12 @@ static int streams_xattr_ftruncate(struct vfs_handle_struct *handle,
ea.value.length = offset + 1;
ea.value.data[offset] = 0;
if (fsp->fh->fd != -1) {
ret = SMB_VFS_FSETXATTR(fsp,
if (fsp->base_fsp->fh->fd != -1) {
ret = SMB_VFS_FSETXATTR(fsp->base_fsp,
sio->xattr_name,
ea.value.data, ea.value.length, 0);
} else {
ret = SMB_VFS_SETXATTR(fsp->conn, sio->base,
ret = SMB_VFS_SETXATTR(fsp->conn, fsp->base_fsp->fsp_name,
sio->xattr_name,
ea.value.data, ea.value.length, 0);
}

8
source3/smbd/open.c
View File

@ -2830,13 +2830,7 @@ NTSTATUS create_file_unixpath(connection_struct *conn,
break;
}
DEBUG(10, ("Recursing into create_file_unixpath for "
"base %s\n", base));
/* This call will break any oplock on the base file,
* but will not actually open an underlying fd. */
status = create_file_unixpath(conn, req, base, 0,
status = create_file_unixpath(conn, NULL, base, 0,
FILE_SHARE_READ
| FILE_SHARE_WRITE
| FILE_SHARE_DELETE,