From patchwork Thu Apr 14 06:31:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel J Blueman X-Patchwork-Id: 706331 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 p3E6XC0b021946 for ; Thu, 14 Apr 2011 06:33:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757139Ab1DNGdJ (ORCPT ); Thu, 14 Apr 2011 02:33:09 -0400 Received: from mail-px0-f179.google.com ([209.85.212.179]:64433 "EHLO mail-px0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757098Ab1DNGdI (ORCPT ); Thu, 14 Apr 2011 02:33:08 -0400 Received: by pxi2 with SMTP id 2so722272pxi.10 for ; Wed, 13 Apr 2011 23:33:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=JCFJc3qsWe4v4ejaKBG+khbc4t1kW5Gg8CVCVoratHc=; b=nAQL974WcYvwisFqW3bosuLTrTRhcRJWXHIti2MZhNUYFVm3zP3/XihTRhCnGNQ3lc k3k/hr3kaEJIHYHJgYFzVN5vVFXtUCpzZSY8UGbR4HcZg6MGhyWxZUwjD/+6KBuFb7zV 0AHQ5Sk9l+g+LaHq4+cLV2B4IPl4UO33DccoY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=US7Ycq884LPUtpyM82eeWMRAF7KFVyDcwXiKfFKSusX5YATFWVr8BCEPmyDfvdH5/W x8n7lL3VtcWEovQWhBdgNL6a6hkyf4ga8ZlQt6dptjo98850vl9RvCZdv74U0qkbjkCv dvJOZJNXGezI88OogZOF6YnW/l1r1dEIPLvpo= Received: by 10.68.50.137 with SMTP id c9mr246004pbo.281.1302762788263; Wed, 13 Apr 2011 23:33:08 -0700 (PDT) Received: from localhost.localdomain ([119.75.36.222]) by mx.google.com with ESMTPS id z10sm1848285wfj.15.2011.04.13.23.33.06 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 13 Apr 2011 23:33:07 -0700 (PDT) From: Daniel J Blueman To: Chris Mason Cc: Linux BTRFS , Josef Bacik Subject: [PATCH] mark internal functions static (fixed) Date: Thu, 14 Apr 2011 14:31:29 +0800 Message-Id: <1302762689-22463-1-git-send-email-daniel.blueman@gmail.com> X-Mailer: git-send-email 1.7.1 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 (demeter1.kernel.org [140.211.167.41]); Thu, 14 Apr 2011 06:33:13 +0000 (UTC) This didn't make it in before, so updating to 2.6.39-rc3 and resending: Prevent needless exporting of internal functions from compilation units by marking them static. --- fs/btrfs/ctree.c | 2 +- fs/btrfs/disk-io.c | 2 +- fs/btrfs/extent-tree.c | 4 ++-- fs/btrfs/inode.c | 2 +- fs/btrfs/ioctl.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 84d7ca1..6581b37 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -74,7 +74,7 @@ noinline void btrfs_set_path_blocking(struct btrfs_path *p) * retake all the spinlocks in the path. You can safely use NULL * for held */ -noinline void btrfs_clear_path_blocking(struct btrfs_path *p, +static noinline void btrfs_clear_path_blocking(struct btrfs_path *p, struct extent_buffer *held) { int i; diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 8f1d44b..59f2567 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -2313,7 +2313,7 @@ static int write_dev_supers(struct btrfs_device *device, return errors < i ? 0 : -1; } -int write_all_supers(struct btrfs_root *root, int max_mirrors) +static int write_all_supers(struct btrfs_root *root, int max_mirrors) { struct list_head *head; struct btrfs_device *dev; diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index f619c3c..5394255 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -75,7 +75,7 @@ static int block_group_bits(struct btrfs_block_group_cache *cache, u64 bits) return (cache->flags & bits) == bits; } -void btrfs_get_block_group(struct btrfs_block_group_cache *cache) +static void btrfs_get_block_group(struct btrfs_block_group_cache *cache) { atomic_inc(&cache->count); } @@ -3586,7 +3586,7 @@ static void block_rsv_add_bytes(struct btrfs_block_rsv *block_rsv, spin_unlock(&block_rsv->lock); } -void block_rsv_release_bytes(struct btrfs_block_rsv *block_rsv, +static void block_rsv_release_bytes(struct btrfs_block_rsv *block_rsv, struct btrfs_block_rsv *dest, u64 num_bytes) { struct btrfs_space_info *space_info = block_rsv->space_info; diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 5cc64ab..e5e0cf7 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -5305,7 +5305,7 @@ out: return em; } -struct extent_map *btrfs_get_extent_fiemap(struct inode *inode, struct page *page, +static struct extent_map *btrfs_get_extent_fiemap(struct inode *inode, struct page *page, size_t pg_offset, u64 start, u64 len, int create) { diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index cfc264f..de76a6d 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -2281,7 +2281,7 @@ static void get_block_group_info(struct list_head *groups_list, } } -long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg) +static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg) { struct btrfs_ioctl_space_args space_args; struct btrfs_ioctl_space_info space;