From 7a0b5d6fc51d5d212529e82e5ed8e21516bfbe27 Mon Sep 17 00:00:00 2001 From: Frank Lahm Date: Thu, 13 Oct 2011 15:41:53 -0700 Subject: Add support for VFS op streaminfo chaining in all relevant VFS modules. Autobuild-User: Jeremy Allison Autobuild-Date: Fri Oct 14 03:26:06 CEST 2011 on sn-devel-104 --- source3/modules/onefs_streams.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'source3/modules/onefs_streams.c') diff --git a/source3/modules/onefs_streams.c b/source3/modules/onefs_streams.c index 78230bcad6..a9b4066cc7 100644 --- a/source3/modules/onefs_streams.c +++ b/source3/modules/onefs_streams.c @@ -736,25 +736,14 @@ NTSTATUS onefs_streaminfo(vfs_handle_struct *handle, return map_nt_error_from_unix(errno); } - state.streams = NULL; - state.num_streams = 0; + state.streams = *pstreams; + state.num_streams = *pnum_streams; if (lp_parm_bool(SNUM(handle->conn), PARM_ONEFS_TYPE, PARM_IGNORE_STREAMS, PARM_IGNORE_STREAMS_DEFAULT)) { goto out; } - /* Add the default stream. */ - if (S_ISREG(sbuf.st_ex_mode)) { - if (!add_one_stream(mem_ctx, - &state.num_streams, &state.streams, - "", sbuf.st_ex_size, - SMB_VFS_GET_ALLOC_SIZE(handle->conn, fsp, - &sbuf))) { - return NT_STATUS_NO_MEMORY; - } - } - state.mem_ctx = mem_ctx; state.handle = handle; state.status = NT_STATUS_OK; @@ -778,5 +767,5 @@ NTSTATUS onefs_streaminfo(vfs_handle_struct *handle, out: *num_streams = state.num_streams; *streams = state.streams; - return NT_STATUS_OK; + return SMB_VFS_NEXT_STREAMINFO(handle, fsp, fname, mem_ctx, pnum_streams, pstreams); } -- cgit