From f8960c101441987c26575b8f69e4fa6a9eebf587 Mon Sep 17 00:00:00 2001 From: Lukas Czerner Date: Wed, 23 Feb 2011 12:22:49 -0500 Subject: [PATCH] --- yaml --- r: 242357 b: refs/heads/master c: 0b75a840120b1e647e32342e9cc46631410088d5 h: refs/heads/master i: 242355: 9cf5a1b9fc95385d6352b599549f6cdf004235b1 v: v3 --- [refs] | 2 +- trunk/fs/ext4/mballoc.c | 3 ++- trunk/fs/ext4/super.c | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 36249cdc21c8..e042284d4a94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5dbd571d875d73e087c1eeb3d840cfc653a97422 +refs/heads/master: 0b75a840120b1e647e32342e9cc46631410088d5 diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c index d1fe09aea73d..ae4d7f5edbbf 100644 --- a/trunk/fs/ext4/mballoc.c +++ b/trunk/fs/ext4/mballoc.c @@ -4753,7 +4753,8 @@ static int ext4_trim_extent(struct super_block *sb, int start, int count, * bitmap. Then issue a TRIM command on this extent and free the extent in * the group buddy bitmap. This is done until whole group is scanned. */ -ext4_grpblk_t ext4_trim_all_free(struct super_block *sb, struct ext4_buddy *e4b, +static ext4_grpblk_t +ext4_trim_all_free(struct super_block *sb, struct ext4_buddy *e4b, ext4_grpblk_t start, ext4_grpblk_t max, ext4_grpblk_t minblocks) { void *bitmap; diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c index a1ac24b6a758..1539cf559784 100644 --- a/trunk/fs/ext4/super.c +++ b/trunk/fs/ext4/super.c @@ -54,9 +54,9 @@ static struct proc_dir_entry *ext4_proc_root; static struct kset *ext4_kset; -struct ext4_lazy_init *ext4_li_info; -struct mutex ext4_li_mtx; -struct ext4_features *ext4_feat; +static struct ext4_lazy_init *ext4_li_info; +static struct mutex ext4_li_mtx; +static struct ext4_features *ext4_feat; static int ext4_load_journal(struct super_block *, struct ext4_super_block *, unsigned long journal_devnum);