From patchwork Mon Aug 29 14:57:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "jeff.liu" X-Patchwork-Id: 1108422 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7TF0mQp002276 for ; Mon, 29 Aug 2011 15:00:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753874Ab1H2O57 (ORCPT ); Mon, 29 Aug 2011 10:57:59 -0400 Received: from rcsinet15.oracle.com ([148.87.113.117]:28591 "EHLO rcsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753604Ab1H2O57 (ORCPT ); Mon, 29 Aug 2011 10:57:59 -0400 Received: from rtcsinet22.oracle.com (rtcsinet22.oracle.com [66.248.204.30]) by rcsinet15.oracle.com (Switch-3.4.4/Switch-3.4.4) with ESMTP id p7TEvtQh001938 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 29 Aug 2011 14:57:58 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by rtcsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id p7TEvsL9026138 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 29 Aug 2011 14:57:55 GMT Received: from abhmt119.oracle.com (abhmt119.oracle.com [141.146.116.71]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id p7TEvnSf016776 for ; Mon, 29 Aug 2011 09:57:49 -0500 Received: from [192.168.1.103] (/123.119.98.76) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 29 Aug 2011 07:57:49 -0700 Message-ID: <4E5BA8EA.8050407@oracle.com> Date: Mon, 29 Aug 2011 22:57:46 +0800 From: Jeff Liu Reply-To: jeff.liu@oracle.com Organization: Oracle User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.18) Gecko/20110617 Thunderbird/3.1.11 MIME-Version: 1.0 To: linux-btrfs@vger.kernel.org Subject: trivial fix s/u64/u32/ for sb->s_blocksize X-Source-IP: rtcsinet22.oracle.com [66.248.204.30] X-CT-RefId: str=0001.0A090203.4E5BA8F6.0161,ss=1,re=0.000,fgs=0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 29 Aug 2011 15:00:48 +0000 (UTC) Hello, in btrfs_ioctl_clone(), using u32 for super_block->s_blocksize assignment. Signed-off-by: Jie Liu * TODO: --- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 970977a..03ab77a 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -2133,12 +2133,12 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd, struct extent_buffer *leaf; char *buf; struct btrfs_key key; - u32 nritems; int slot; int ret; u64 len = olen; - u64 bs = root->fs_info->sb->s_blocksize; u64 hint_byte; + u32 bs = root->fs_info->sb->s_blocksize; + u32 nritems; /*