From patchwork Thu Mar 25 12:29:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miao Xie X-Patchwork-Id: 88209 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 o2PCTtE4029396 for ; Thu, 25 Mar 2010 12:29:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753432Ab0CYM3c (ORCPT ); Thu, 25 Mar 2010 08:29:32 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:59232 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753417Ab0CYM3b (ORCPT ); Thu, 25 Mar 2010 08:29:31 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 9FA5A170080; Thu, 25 Mar 2010 20:29:30 +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 o2PCSBGa005926; Thu, 25 Mar 2010 20:28:11 +0800 Received: from [127.0.0.1] (unknown [10.167.141.211]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id D5C96DC220; Thu, 25 Mar 2010 20:31:56 +0800 (CST) Message-ID: <4BAB573A.3080003@cn.fujitsu.com> Date: Thu, 25 Mar 2010 20:29:46 +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 04/18] btrfs: Simplify btrfs_item_ptr macro 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:29:56 +0000 (UTC) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 1111584..72228b2 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -1947,13 +1947,11 @@ static inline u32 btrfs_level_size(struct btrfs_root *root, int level) } /* helper function to cast into the data area of the leaf. */ -#define btrfs_item_ptr(leaf, slot, type) \ - ((type *)(btrfs_leaf_data(leaf) + \ - btrfs_item_offset_nr(leaf, slot))) - #define btrfs_item_ptr_offset(leaf, slot) \ ((unsigned long)(btrfs_leaf_data(leaf) + \ btrfs_item_offset_nr(leaf, slot))) +#define btrfs_item_ptr(leaf, slot, type) \ + ((type *)btrfs_item_ptr_offset(leaf, slot)) static inline struct dentry *fdentry(struct file *file) {