From patchwork Mon Apr 11 15:56:31 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Daniel J Blueman <daniel.blueman@gmail.com>
X-Patchwork-Id: 698501
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3BFucRR016061
	for <patchwork-linux-btrfs@patchwork.kernel.org>;
	Mon, 11 Apr 2011 15:56:39 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751673Ab1DKP4c (ORCPT
	<rfc822;patchwork-linux-btrfs@patchwork.kernel.org>);
	Mon, 11 Apr 2011 11:56:32 -0400
Received: from mail-iy0-f174.google.com ([209.85.210.174]:36779 "EHLO
	mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751491Ab1DKP4b (ORCPT
	<rfc822;linux-btrfs@vger.kernel.org>);
	Mon, 11 Apr 2011 11:56:31 -0400
Received: by iyb14 with SMTP id 14so5736682iyb.19
	for <linux-btrfs@vger.kernel.org>;
	Mon, 11 Apr 2011 08:56:31 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:mime-version:date:message-id:subject:from:to:cc
	:content-type;
	bh=ktwUyhOnCvNsrCL+Lzo3SvtuQ44zNQbyvysmOMocu4E=;
	b=f9beOx6RETaeSQsVdBH/k16dMGfLpPJ4Ix4MYKfS3K9/vaOkVMnT/AO1CXzxJyU6FY
	Hg9pTPorxRMJXyZNBpZcJdw83IRhGe3+cEK7GnrqIOh5dEGFJUCzxXAVGFmDS4HiwL/L
	0WNmCn8VTRXRfOVUGyZbMLS7+e4F2QA+MmaGE=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:date:message-id:subject:from:to:cc:content-type;
	b=o5zWK9kajoFaw6SR7zAXf7n5RL36OTXw0m3v80ECzsEeUerQDyOaAyuaqO1NCKCxSl
	dPsNPB9Ri2+xreJeuCaYH1XZ9SLxzKCLzTFtLWdadj6wilHyAkmfAf8gmrbH7CQhE6Y0
	jB5T8fI/u5zkbJ5Ohmk3lRjNLP29fFSgNi9wM=
MIME-Version: 1.0
Received: by 10.231.215.140 with SMTP id he12mr3654397ibb.57.1302537391236;
	Mon, 11 Apr 2011 08:56:31 -0700 (PDT)
Received: by 10.231.162.6 with HTTP; Mon, 11 Apr 2011 08:56:31 -0700 (PDT)
Date: Mon, 11 Apr 2011 23:56:31 +0800
Message-ID: <BANLkTi=AzkUgTeRgUa1QkQMBiZLoOyQS-g@mail.gmail.com>
Subject: [PATCH] fix user annotation in ioctl.c
From: Daniel J Blueman <daniel.blueman@gmail.com>
To: Chris Mason <chris.mason@oracle.com>
Cc: Linux BTRFS <linux-btrfs@vger.kernel.org>
Sender: linux-btrfs-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-btrfs.vger.kernel.org>
X-Mailing-List: linux-btrfs@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Mon, 11 Apr 2011 15:56:39 +0000 (UTC)

Fix address space annotation correct in ioctl.c.

Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com>

 		       BTRFS_BLOCK_GROUP_SYSTEM,
@@ -2387,7 +2387,7 @@ long btrfs_ioctl_space_info(struct btrfs_root
*root, void __user *arg)
 		up_read(&info->groups_sem);
 	}

-	user_dest = (struct btrfs_ioctl_space_info *)
+	user_dest = (struct btrfs_ioctl_space_info __user *)
 		(arg + sizeof(struct btrfs_ioctl_space_args));

 	if (copy_to_user(user_dest, dest_orig, alloc_size))
Reviewed-by: Josef Bacik <josef@redhat.com>

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index cfc264f..0474ec3 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -2287,7 +2287,7 @@ long btrfs_ioctl_space_info(struct btrfs_root
*root, void __user *arg)
 	struct btrfs_ioctl_space_info space;
 	struct btrfs_ioctl_space_info *dest;
 	struct btrfs_ioctl_space_info *dest_orig;
-	struct btrfs_ioctl_space_info *user_dest;
+	struct btrfs_ioctl_space_info __user *user_dest;
 	struct btrfs_space_info *info;
 	u64 types[] = {BTRFS_BLOCK_GROUP_DATA,