From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 21 Aug 2012 11:22:31 +0000 (+1000)
Subject: s3-vfs: Remove extra calls to SMB_VFS_HANDLE_GET_DATA
X-Git-Tag: samba-4.0.0beta7~91
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=450fcd79c795698c33ef2e0e4e85460128ba7bfd;p=thirdparty%2Fsamba.git

s3-vfs: Remove extra calls to SMB_VFS_HANDLE_GET_DATA

Found by the talloc_stackframe() out of order checker!

Andrew Bartlett
---

diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c
index 36e113e7802..c0debed1f7e 100644
--- a/source3/modules/vfs_xattr_tdb.c
+++ b/source3/modules/vfs_xattr_tdb.c
@@ -150,8 +150,6 @@ static int xattr_tdb_setxattr(struct vfs_handle_struct *handle,
 					TALLOC_FREE(frame); return -1;
 				});
 
-	SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
-
 	ret = xattr_tdb_get_file_id(handle, path, &id);
 	if (ret == -1) {
 		TALLOC_FREE(frame);
@@ -207,8 +205,6 @@ static ssize_t xattr_tdb_listxattr(struct vfs_handle_struct *handle,
 					TALLOC_FREE(frame); return -1;
 				});
 
-	SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
-
 	ret = xattr_tdb_get_file_id(handle, path, &id);
 	if (ret == -1) {
 		TALLOC_FREE(frame);
@@ -263,8 +259,6 @@ static int xattr_tdb_removexattr(struct vfs_handle_struct *handle,
 					TALLOC_FREE(frame); return -1;
 				});
 
-	SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, TALLOC_FREE(frame); return -1);
-
 	ret = xattr_tdb_get_file_id(handle, path, &id);
 	if (ret == -1) {
 		TALLOC_FREE(frame);