From patchwork Thu Mar 25 12:28:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miao Xie X-Patchwork-Id: 88208 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2PCSfpi028579 for ; Thu, 25 Mar 2010 12:28:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752744Ab0CYM2g (ORCPT ); Thu, 25 Mar 2010 08:28:36 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:63878 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751878Ab0CYM2f (ORCPT ); Thu, 25 Mar 2010 08:28:35 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 5ADD8170080; Thu, 25 Mar 2010 20:28:35 +0800 (CST) Received: from fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id o2PCRGTL005909; Thu, 25 Mar 2010 20:27:16 +0800 Received: from [127.0.0.1] (unknown [10.167.141.211]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 9E2C7DC220; Thu, 25 Mar 2010 20:31:01 +0800 (CST) Message-ID: <4BAB5703.2080104@cn.fujitsu.com> Date: Thu, 25 Mar 2010 20:28:51 +0800 From: Miao Xie Reply-To: miaox@cn.fujitsu.com User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9.1.8) Gecko/20100227 Thunderbird/3.0.3 MIME-Version: 1.0 To: Chris Mason CC: Linux Btrfs Subject: [PATCH 03/18] btrfs: Calculate member variant's address directly for btrfs_set_##name 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.3 (demeter.kernel.org [140.211.167.41]); Thu, 25 Mar 2010 12:28:41 +0000 (UTC) diff --git a/fs/btrfs/struct-funcs.c b/fs/btrfs/struct-funcs.c index b0f80c0..4ec8055 100644 --- a/fs/btrfs/struct-funcs.c +++ b/fs/btrfs/struct-funcs.c @@ -86,13 +86,13 @@ void btrfs_set_##name(struct extent_buffer *eb, \ { \ unsigned long part_offset = (unsigned long)s; \ unsigned long offset = part_offset + offsetof(type, member); \ - type *p; \ + u##bits *p; \ /* ugly, but we want the fast path here */ \ if (eb->map_token && offset >= eb->map_start && \ offset + sizeof(((type *)0)->member) <= eb->map_start + \ eb->map_len) { \ - p = (type *)(eb->kaddr + part_offset - eb->map_start); \ - p->member = cpu_to_le##bits(val); \ + p = (u##bits *)(eb->kaddr + offset - eb->map_start); \ + *p = cpu_to_le##bits(val); \ return; \ } \ { \ @@ -112,8 +112,8 @@ void btrfs_set_##name(struct extent_buffer *eb, \ write_eb_member(eb, s, type, member, &val2); \ return; \ } \ - p = (type *)(kaddr + part_offset - map_start); \ - p->member = cpu_to_le##bits(val); \ + p = (u##bits *)(kaddr + offset - map_start); \ + *p = cpu_to_le##bits(val); \ if (unmap_on_exit) \ unmap_extent_buffer(eb, map_token, KM_USER1); \ } \