diff options
| author | Andrew Morton <akpm@osdl.org> | 2003-07-10 10:02:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-07-10 10:02:22 -0700 |
| commit | ecbaa73016cbdf6377fd07753f85d87673388d83 (patch) | |
| tree | 6de7b23eaeed5506513e79ac887cd1941ceff763 | |
| parent | f3eee922929b81769b26f38885d2284b16c2d19a (diff) | |
[PATCH] misc fixes
- remove accidental debug code from ext3 commit.
- /proc/profile documentation fix (Randy Dunlap)
- use sb_breadahead() in ext2_preread_inode()
- unused var in mpage_writepages()
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 | ||||
| -rw-r--r-- | fs/ext2/ialloc.c | 5 | ||||
| -rw-r--r-- | fs/jbd/commit.c | 21 | ||||
| -rw-r--r-- | fs/mpage.c | 2 |
4 files changed, 6 insertions, 24 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 1207519cf4db..85bae08f4e17 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -772,7 +772,7 @@ running once the system is up. Ranges are in pairs (memory base and size). profile= [KNL] Enable kernel profiling via /proc/profile - Format: <log_level> + (param: profile step/bucket size as a power of 2) prompt_ramdisk= [RAM] List of RAM disks to prompt for floppy disk before loading. diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c index 107ff87b7208..231230140dea 100644 --- a/fs/ext2/ialloc.c +++ b/fs/ext2/ialloc.c @@ -235,10 +235,7 @@ static void ext2_preread_inode(struct inode *inode) EXT2_INODE_SIZE(inode->i_sb); block = le32_to_cpu(gdp->bg_inode_table) + (offset >> EXT2_BLOCK_SIZE_BITS(inode->i_sb)); - bh = sb_getblk(inode->i_sb, block); - if (!buffer_uptodate(bh) && !buffer_locked(bh)) - ll_rw_block(READA, 1, &bh); - __brelse(bh); + sb_breadahead(inode->i_sb, block); } /* diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index 2580162cad52..54f7862a3717 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c @@ -169,23 +169,10 @@ void journal_commit_transaction(journal_t *journal) * that multiple journal_get_write_access() calls to the same * buffer are perfectly permissable. */ - { - int nr = 0; - while (commit_transaction->t_reserved_list) { - jh = commit_transaction->t_reserved_list; - JBUFFER_TRACE(jh, "reserved, unused: refile"); - journal_refile_buffer(journal, jh); - nr++; - } - if (nr) { - static int noisy; - - if (noisy < 10) { - noisy++; - printk("%s: freed %d reserved buffers\n", - __FUNCTION__, nr); - } - } + while (commit_transaction->t_reserved_list) { + jh = commit_transaction->t_reserved_list; + JBUFFER_TRACE(jh, "reserved, unused: refile"); + journal_refile_buffer(journal, jh); } /* diff --git a/fs/mpage.c b/fs/mpage.c index b20bdc898659..bbdfbc645850 100644 --- a/fs/mpage.c +++ b/fs/mpage.c @@ -614,7 +614,6 @@ mpage_writepages(struct address_space *mapping, sector_t last_block_in_bio = 0; int ret = 0; int done = 0; - struct pagevec pvec; int (*writepage)(struct page *page, struct writeback_control *wbc); if (wbc->nonblocking && bdi_write_congested(bdi)) { @@ -626,7 +625,6 @@ mpage_writepages(struct address_space *mapping, if (get_block == NULL) writepage = mapping->a_ops->writepage; - pagevec_init(&pvec, 0); spin_lock(&mapping->page_lock); while (!list_empty(&mapping->io_pages) && !done) { struct page *page = list_entry(mapping->io_pages.prev, |
