From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@linux-foundation.org>,
Vladimir Saveliev <vs@namesys.com>, Nick Piggin <npiggin@suse.de>
Cc: linux-kernel@vger.kernel.org, reiserfs-dev@namesys.com
Subject: [-mm patch] fs/reiserfs/: cleanups
Date: Fri, 15 Jun 2007 00:16:28 +0200 [thread overview]
Message-ID: <20070614221628.GB3588@stusta.de> (raw)
In-Reply-To: <20070606220313.8f7c1fab.akpm@linux-foundation.org>
This patch contains the following cleanups:
- remove the following no longer used functions:
- bitmap.c: reiserfs_claim_blocks_to_be_allocated()
- bitmap.c: reiserfs_release_claimed_blocks()
- bitmap.c: reiserfs_can_fit_pages()
- make the following functions static:
- inode.c: restart_transaction()
- journal.c: reiserfs_async_progress_wait()
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
fs/reiserfs/bitmap.c | 57 ------------------------------------
fs/reiserfs/inode.c | 4 +-
fs/reiserfs/journal.c | 3 +
include/linux/reiserfs_fs.h | 7 ----
4 files changed, 4 insertions(+), 67 deletions(-)
--- linux-2.6.22-rc4-mm2/include/linux/reiserfs_fs.h.old 2007-06-14 02:08:17.000000000 +0200
+++ linux-2.6.22-rc4-mm2/include/linux/reiserfs_fs.h 2007-06-14 02:11:20.000000000 +0200
@@ -1701,8 +1701,6 @@
return th->t_blocks_allocated - th->t_blocks_logged;
}
-int reiserfs_async_progress_wait(struct super_block *s);
-
struct reiserfs_transaction_handle *reiserfs_persistent_transaction(struct
super_block
*,
@@ -1857,8 +1855,6 @@
#define GET_BLOCK_NO_IMUX 8 /* i_mutex is not held, don't preallocate */
#define GET_BLOCK_NO_DANGLE 16 /* don't leave any transactions running */
-int restart_transaction(struct reiserfs_transaction_handle *th,
- struct inode *inode, struct treepath *path);
void reiserfs_read_locked_inode(struct inode *inode,
struct reiserfs_iget_args *args);
int reiserfs_find_actor(struct inode *inode, void *p);
@@ -2135,9 +2131,6 @@
struct inode *inode);
void reiserfs_discard_all_prealloc(struct reiserfs_transaction_handle *th);
#endif
-void reiserfs_claim_blocks_to_be_allocated(struct super_block *sb, int blocks);
-void reiserfs_release_claimed_blocks(struct super_block *sb, int blocks);
-int reiserfs_can_fit_pages(struct super_block *sb);
/* hashes.c */
__u32 keyed_hash(const signed char *msg, int len);
--- linux-2.6.22-rc4-mm2/fs/reiserfs/bitmap.c.old 2007-06-14 02:08:45.000000000 +0200
+++ linux-2.6.22-rc4-mm2/fs/reiserfs/bitmap.c 2007-06-14 02:09:59.000000000 +0200
@@ -1201,63 +1201,6 @@
return ret;
}
-/* These 2 functions are here to provide blocks reservation to the rest of kernel */
-/* Reserve @blocks amount of blocks in fs pointed by @sb. Caller must make sure
- there are actually this much blocks on the FS available */
-void reiserfs_claim_blocks_to_be_allocated(struct super_block *sb, /* super block of
- filesystem where
- blocks should be
- reserved */
- int blocks /* How much to reserve */
- )
-{
-
- /* Fast case, if reservation is zero - exit immediately. */
- if (!blocks)
- return;
-
- spin_lock(&REISERFS_SB(sb)->bitmap_lock);
- REISERFS_SB(sb)->reserved_blocks += blocks;
- spin_unlock(&REISERFS_SB(sb)->bitmap_lock);
-}
-
-/* Unreserve @blocks amount of blocks in fs pointed by @sb */
-void reiserfs_release_claimed_blocks(struct super_block *sb, /* super block of
- filesystem where
- blocks should be
- reserved */
- int blocks /* How much to unreserve */
- )
-{
-
- /* Fast case, if unreservation is zero - exit immediately. */
- if (!blocks)
- return;
-
- spin_lock(&REISERFS_SB(sb)->bitmap_lock);
- REISERFS_SB(sb)->reserved_blocks -= blocks;
- spin_unlock(&REISERFS_SB(sb)->bitmap_lock);
- RFALSE(REISERFS_SB(sb)->reserved_blocks < 0,
- "amount of blocks reserved became zero?");
-}
-
-/* This function estimates how much pages we will be able to write to FS
- used for reiserfs_file_write() purposes for now. */
-int reiserfs_can_fit_pages(struct super_block *sb /* superblock of filesystem
- to estimate space */ )
-{
- int space;
-
- spin_lock(&REISERFS_SB(sb)->bitmap_lock);
- space =
- (SB_FREE_BLOCKS(sb) -
- REISERFS_SB(sb)->reserved_blocks) >> (PAGE_CACHE_SHIFT -
- sb->s_blocksize_bits);
- spin_unlock(&REISERFS_SB(sb)->bitmap_lock);
-
- return space > 0 ? space : 0;
-}
-
void reiserfs_cache_bitmap_metadata(struct super_block *sb,
struct buffer_head *bh,
struct reiserfs_bitmap_info *info)
--- linux-2.6.22-rc4-mm2/fs/reiserfs/inode.c.old 2007-06-14 02:10:35.000000000 +0200
+++ linux-2.6.22-rc4-mm2/fs/reiserfs/inode.c 2007-06-14 02:10:59.000000000 +0200
@@ -208,8 +208,8 @@
return 0;
}
-/*static*/ int restart_transaction(struct reiserfs_transaction_handle *th,
- struct inode *inode, struct treepath *path)
+static int restart_transaction(struct reiserfs_transaction_handle *th,
+ struct inode *inode, struct treepath *path)
{
struct super_block *s = th->t_super;
int len = th->t_blocks_allocated;
--- linux-2.6.22-rc4-mm2/fs/reiserfs/journal.c.old 2007-06-14 02:11:29.000000000 +0200
+++ linux-2.6.22-rc4-mm2/fs/reiserfs/journal.c 2007-06-14 02:11:40.000000000 +0200
@@ -966,7 +966,8 @@
}
return 0;
}
-int reiserfs_async_progress_wait(struct super_block *s)
+
+static int reiserfs_async_progress_wait(struct super_block *s)
{
DEFINE_WAIT(wait);
struct reiserfs_journal *j = SB_JOURNAL(s);
next prev parent reply other threads:[~2007-06-14 22:18 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-07 5:03 2.6.22-rc4-mm2 Andrew Morton
2007-06-07 6:42 ` 2.6.22-rc4-mm2 William Lee Irwin III
2007-06-07 6:51 ` 2.6.22-rc4-mm2 Andrew Morton
2007-06-07 6:55 ` 2.6.22-rc4-mm2 William Lee Irwin III
2007-06-07 7:01 ` 2.6.22-rc4-mm2 Andrew Morton
2007-06-07 7:04 ` 2.6.22-rc4-mm2 William Lee Irwin III
2007-06-07 7:05 ` 2.6.22-rc4-mm2 William Lee Irwin III
2007-06-07 7:19 ` 2.6.22-rc4-mm2 Andrew Morton
2007-06-07 7:34 ` 2.6.22-rc4-mm2 William Lee Irwin III
2007-06-07 7:11 ` 2.6.22-rc4-mm2 Paul Mundt
2007-06-07 9:19 ` 2.6.22-rc4-mm2 Manuel Lauss
2007-06-07 9:37 ` 2.6.22-rc4-mm2 Paul Mundt
2007-06-07 9:46 ` 2.6.22-rc4-mm2 Manuel Lauss
2007-06-07 20:01 ` 2.6.22-rc4-mm2 Adrian Bunk
2007-06-07 20:14 ` 2.6.22-rc4-mm2 Sam Ravnborg
2007-06-07 11:07 ` 2.6.22-rc4-mm2 Michal Piotrowski
2007-06-07 15:26 ` 2.6.22-rc4-mm2 Andrew Morton
2007-06-07 14:29 ` 2.6.22-rc4-mm2 Valdis.Kletnieks
2007-06-07 15:37 ` 2.6.22-rc4-mm2 - usb-storage Peter Zijlstra
2007-06-07 22:20 ` [usb-storage] " Alan Stern
2007-06-08 8:55 ` Peter Zijlstra
2007-06-08 14:16 ` Alan Stern
2007-06-08 16:30 ` Peter Zijlstra
2007-06-08 16:54 ` Alan Stern
2007-06-08 16:55 ` Peter Zijlstra
2007-06-14 22:47 ` Jeremy Fitzhardinge
2007-06-14 22:58 ` Peter Zijlstra
2007-06-14 23:20 ` Jeremy Fitzhardinge
2007-06-07 19:37 ` 2.6.22-rc4-mm2 Joseph Fannin
2007-06-07 20:31 ` 2.6.22-rc4-mm2 Andrew Morton
2007-06-07 21:46 ` 2.6.22-rc4-mm2: Assigning IP address fails Joseph Fannin
2007-06-07 22:06 ` Andrew Morton
2007-06-07 22:54 ` Herbert Xu
2007-06-08 1:35 ` David Miller
2007-06-12 0:07 ` 2.6.22-rc4-mm2: kvm compile breakage with X86_CMPXCHG64=n Adrian Bunk
2007-06-12 3:22 ` Dave Jones
2007-06-12 22:03 ` Andrew Morton
2007-06-12 22:16 ` Dave Jones
2007-06-12 22:43 ` Andrew Morton
2007-06-12 22:48 ` Dave Jones
2007-06-12 22:37 ` Adrian Bunk
2007-06-12 6:00 ` Avi Kivity
2007-06-12 11:07 ` [-mm patch] make cmdline_parse_kernelcore() static Adrian Bunk
2007-06-12 12:52 ` Mel Gorman
2007-06-12 11:07 ` [-mm patch] make mm/swap_prefetch.c:remove_from_swapped_list() static Adrian Bunk
2007-06-12 11:16 ` Con Kolivas
2007-06-12 23:03 ` [-mm patch] make drivers/acpi/osl.c:osi_linux static Adrian Bunk
2007-06-12 23:03 ` [-mm patch] drivers/acpi/processor_throttling.c: make 2 functions static Adrian Bunk
2007-06-12 23:03 ` [-mm patch] drivers/ata/sata_nv.c: make 3 " Adrian Bunk
2007-06-12 23:03 ` [-mm patch] make drivers/char/selection.c:store_utf8() static Adrian Bunk
2007-06-12 23:03 ` [-mm patch] drivers/cpuidle/governors/menu.c: make a struct static Adrian Bunk
2007-06-13 8:33 ` WARNING: at drivers/usb/core/urb.c:293 usb_submit_urb() [Was: 2.6.22-rc4-mm2] Jiri Slaby
2007-06-13 8:46 ` Jiri Slaby
2007-06-13 9:35 ` [Serial port bug?] was Re: 2.6.22-rc4-mm2 Reuben Farrelly
2007-06-14 22:15 ` [-mm patch] make fs/buffer.c:cont_expand_zero() static Adrian Bunk
2007-06-15 1:36 ` Nick Piggin
2007-06-14 22:15 ` [-mm patch] remove nobh_{prepare,commit}_write() Adrian Bunk
2007-06-26 20:32 ` Andrew Morton
2007-06-26 20:48 ` Dave Kleikamp
2007-06-26 21:23 ` Andrew Morton
2007-06-26 21:33 ` Randy Dunlap
2007-06-27 1:39 ` Nick Piggin
2007-06-14 22:15 ` [-mm patch] make fs/inode.c:wake_up_inode() static Adrian Bunk
2007-06-14 22:16 ` [-mm patch] make fs/libfs.c:simple_commit_write() static Adrian Bunk
2007-06-14 22:16 ` Adrian Bunk [this message]
2007-06-15 1:37 ` [-mm patch] fs/reiserfs/: cleanups Nick Piggin
2007-06-14 22:16 ` [-mm patch] make init/do_mounts.c:root_wait static Adrian Bunk
2007-06-14 22:16 ` [-mm patch] drivers/ide/ide-dma.c: unexport ide_set_dma Adrian Bunk
2007-06-16 0:18 ` Bartlomiej Zolnierkiewicz
2007-06-17 23:42 ` [-mm patch] arch/i386/video/fbdev.c should #include <asm/fb.h> Adrian Bunk
2007-06-18 4:52 ` Sam Ravnborg
2007-06-19 13:53 ` 2.6.22-rc4-mm2 J.A. Magallón
2007-06-19 14:34 ` 2.6.22-rc4-mm2 J.A. Magallón
2007-06-20 7:23 ` 2.6.22-rc4-mm2 Jiri Slaby
2007-06-20 21:54 ` 2.6.22-rc4-mm2 J.A. Magallón
2007-06-20 5:22 ` can't suspend on vaio sz (rc4 and rc5 are ok) [was Re: 2.6.22-rc4-mm2] Mattia Dongili
2007-06-20 11:40 ` Rafael J. Wysocki
2007-06-20 15:38 ` Mattia Dongili
2007-06-20 20:50 ` Rafael J. Wysocki
2007-06-20 22:03 ` Rafael J. Wysocki
2007-06-20 22:22 ` Rafael J. Wysocki
2007-06-21 15:28 ` Alan Stern
2007-06-21 19:39 ` Alan Stern
2007-06-21 21:49 ` Rafael J. Wysocki
2007-06-22 9:25 ` Mattia Dongili
2007-06-22 13:59 ` Alan Stern
2007-06-24 5:27 ` Mattia Dongili
2007-06-24 8:33 ` it's iwl3945 [Re: " Mattia Dongili
2007-06-20 14:01 ` [linux-usb-devel] " Alan Stern
2007-06-20 14:12 ` Rafael J. Wysocki
2007-06-21 23:52 ` [-mm patch] mark calibrate_xor_blocks() __init Adrian Bunk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070614221628.GB3588@stusta.de \
--to=bunk@stusta.de \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=npiggin@suse.de \
--cc=reiserfs-dev@namesys.com \
--cc=vs@namesys.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).