Commit ecbaa730 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[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()
parent f3eee922
...@@ -772,7 +772,7 @@ running once the system is up. ...@@ -772,7 +772,7 @@ running once the system is up.
Ranges are in pairs (memory base and size). Ranges are in pairs (memory base and size).
profile= [KNL] Enable kernel profiling via /proc/profile 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 prompt_ramdisk= [RAM] List of RAM disks to prompt for floppy disk
before loading. before loading.
......
...@@ -235,10 +235,7 @@ static void ext2_preread_inode(struct inode *inode) ...@@ -235,10 +235,7 @@ static void ext2_preread_inode(struct inode *inode)
EXT2_INODE_SIZE(inode->i_sb); EXT2_INODE_SIZE(inode->i_sb);
block = le32_to_cpu(gdp->bg_inode_table) + block = le32_to_cpu(gdp->bg_inode_table) +
(offset >> EXT2_BLOCK_SIZE_BITS(inode->i_sb)); (offset >> EXT2_BLOCK_SIZE_BITS(inode->i_sb));
bh = sb_getblk(inode->i_sb, block); sb_breadahead(inode->i_sb, block);
if (!buffer_uptodate(bh) && !buffer_locked(bh))
ll_rw_block(READA, 1, &bh);
__brelse(bh);
} }
/* /*
......
...@@ -169,23 +169,10 @@ void journal_commit_transaction(journal_t *journal) ...@@ -169,23 +169,10 @@ void journal_commit_transaction(journal_t *journal)
* that multiple journal_get_write_access() calls to the same * that multiple journal_get_write_access() calls to the same
* buffer are perfectly permissable. * buffer are perfectly permissable.
*/ */
{ while (commit_transaction->t_reserved_list) {
int nr = 0; jh = commit_transaction->t_reserved_list;
while (commit_transaction->t_reserved_list) { JBUFFER_TRACE(jh, "reserved, unused: refile");
jh = commit_transaction->t_reserved_list; journal_refile_buffer(journal, jh);
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);
}
}
} }
/* /*
......
...@@ -614,7 +614,6 @@ mpage_writepages(struct address_space *mapping, ...@@ -614,7 +614,6 @@ mpage_writepages(struct address_space *mapping,
sector_t last_block_in_bio = 0; sector_t last_block_in_bio = 0;
int ret = 0; int ret = 0;
int done = 0; int done = 0;
struct pagevec pvec;
int (*writepage)(struct page *page, struct writeback_control *wbc); int (*writepage)(struct page *page, struct writeback_control *wbc);
if (wbc->nonblocking && bdi_write_congested(bdi)) { if (wbc->nonblocking && bdi_write_congested(bdi)) {
...@@ -626,7 +625,6 @@ mpage_writepages(struct address_space *mapping, ...@@ -626,7 +625,6 @@ mpage_writepages(struct address_space *mapping,
if (get_block == NULL) if (get_block == NULL)
writepage = mapping->a_ops->writepage; writepage = mapping->a_ops->writepage;
pagevec_init(&pvec, 0);
spin_lock(&mapping->page_lock); spin_lock(&mapping->page_lock);
while (!list_empty(&mapping->io_pages) && !done) { while (!list_empty(&mapping->io_pages) && !done) {
struct page *page = list_entry(mapping->io_pages.prev, struct page *page = list_entry(mapping->io_pages.prev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment