Attachment 6659 Details for Bug 8281 – updated patchset without talloc/TALLOC clutter

[patch] updated patchset without talloc/TALLOC clutter

vfs_examples_build_fix_3.6.patch (text/plain), 4.21 KB, created by Michael Adam on 2011-07-01 10:57:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Adam

Created: 2011-07-01 10:57:05 UTC

Size: 4.21 KB

patch

obsolete

>From 35d3abd8b57c3b4dd22312cbefb67e6884b10ec9 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Wed, 29 Jun 2011 16:53:57 +0200
>Subject: [PATCH 1/3] examples/VFS: fix shadow_copy_test.c in reference to shadow_copy changes
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>---
> examples/VFS/shadow_copy_test.c |   13 ++++++++++---
> 1 files changed, 10 insertions(+), 3 deletions(-)
>
>diff --git a/examples/VFS/shadow_copy_test.c b/examples/VFS/shadow_copy_test.c
>index fab7007..4a9e64f 100644
>--- a/examples/VFS/shadow_copy_test.c
>+++ b/examples/VFS/shadow_copy_test.c
>@@ -19,6 +19,8 @@
>  */
> 
> #include "includes.h"
>+#include "ntioctl.h"
>+#include "smbd/proto.h"
> 
> #undef DBGC_CLASS
> #define DBGC_CLASS DBGC_VFS
>@@ -50,7 +52,10 @@
> 	  Directories are always displayed...    
> */
> 
>-static int test_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
>+static int test_get_shadow_copy_data(vfs_handle_struct *handle,
>+				    files_struct *fsp,
>+				    struct shadow_copy_data *shadow_copy_data,
>+				    bool labels)
> {
> 	uint32 num = 3;
> 	uint32 i;
>@@ -59,7 +64,7 @@ static int test_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fs
> 	
> 	if (labels) {	
> 		if (num) {
>-			shadow_copy_data->labels = TALLOC_ZERO_ARRAY(shadow_copy_data->mem_ctx,SHADOW_COPY_LABEL,num);
>+			shadow_copy_data->labels = TALLOC_ZERO_ARRAY(shadow_copy_data,SHADOW_COPY_LABEL,num);
> 		} else {
> 			shadow_copy_data->labels = NULL;
> 		}
>@@ -81,5 +86,7 @@ static struct vfs_fn_pointers vfs_test_shadow_copy_fns = {
> 
> NTSTATUS vfs_shadow_copy_test_init(void)
> {
>-	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "shadow_copy_test", &vfs_test_shadow_copy_fns);
>+	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
>+				"shadow_copy_test",
>+				&vfs_test_shadow_copy_fns);
> }
>-- 
>1.7.1
>
>
>From dfbcee27d0c892c3bf071383c8777723c5b7a253 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Wed, 29 Jun 2011 16:56:45 +0200
>Subject: [PATCH 2/3] examples/VFS: fix skel_opaque.c in reference to shadow_copy changes
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>---
> examples/VFS/skel_opaque.c |    3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
>diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
>index f60f0fe..7b422b2 100644
>--- a/examples/VFS/skel_opaque.c
>+++ b/examples/VFS/skel_opaque.c
>@@ -23,6 +23,7 @@
> 
> 
> #include "includes.h"
>+#include "smbd/proto.h"
> 
> /* PLEASE,PLEASE READ THE VFS MODULES CHAPTER OF THE 
>    SAMBA DEVELOPERS GUIDE!!!!!!
>@@ -65,7 +66,7 @@ static int skel_set_quota(vfs_handle_struct *handle,  enum SMB_QUOTA_TYPE qtype,
> 	return -1;
> }
> 
>-static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
>+static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, struct shadow_copy_data *shadow_copy_data, bool labels)
> {
> 	errno = ENOSYS;
> 	return -1;
>-- 
>1.7.1
>
>
>From 9a354a9d890457c4ece24af9689c31bd6c5a9d5c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Wed, 29 Jun 2011 16:57:27 +0200
>Subject: [PATCH 3/3] examples/VFS: fix skel_transparent.c in reference to shadow_copy changes
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>---
> examples/VFS/skel_transparent.c |    3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
>diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
>index f06e02a..37e6a70 100644
>--- a/examples/VFS/skel_transparent.c
>+++ b/examples/VFS/skel_transparent.c
>@@ -23,6 +23,7 @@
> 
> 
> #include "includes.h"
>+#include "smbd/proto.h"
> 
> /* PLEASE,PLEASE READ THE VFS MODULES CHAPTER OF THE 
>    SAMBA DEVELOPERS GUIDE!!!!!!
>@@ -64,7 +65,7 @@ static int skel_set_quota(vfs_handle_struct *handle,  enum SMB_QUOTA_TYPE qtype,
> 	return SMB_VFS_NEXT_SET_QUOTA(handle, qtype, id, dq);
> }
> 
>-static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
>+static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, struct shadow_copy_data *shadow_copy_data, bool labels)
> {
> 	return SMB_VFS_NEXT_GET_SHADOW_COPY_DATA(handle, fsp, shadow_copy_data, labels);
> }
>-- 
>1.7.1
>

Flags:

bjacke: review+

Actions: View

Attachments on bug 8281: 6658 | 6659 | 6660