s3-vfs: Remove extra calls to SMB_VFS_HANDLE_GET_DATA
authorAndrew Bartlett <abartlet@samba.org>
Tue, 21 Aug 2012 11:22:31 +0000 (21:22 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 21 Aug 2012 23:31:57 +0000 (01:31 +0200)
Found by the talloc_stackframe() out of order checker!

Andrew Bartlett

source3/modules/vfs_xattr_tdb.c

index 36e113e780272829eefed36834bba82774f3fa21..c0debed1f7e7220ff8ea4e04e4bafe4afe55b6eb 100644 (file)
@@ -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);