lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] clean up __set_page_dirty_nobuffers()

Browse Source 
Save a tabstop in __set_page_dirty_nobuffers() and __set_page_dirty_buffers()
and a few other places.  No functional changes.

Cc: Jay Lan <jlan@sgi.com>
Cc: Shailabh Nagar <nagar@watson.ibm.com>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: Chris Sturtivant <csturtiv@sgi.com>
Cc: Tony Ernst <tee@sgi.com>
Cc: Guillaume Thouvenin <guillaume.thouvenin@bull.net>
Cc: David Wright <daw@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andrew Morton
2006-12-10 02:19:24 -08:00
committed by Linus Torvalds
parent 7c3ab7381e
commit 8c08540f87
2 changed files with 55 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/buffer.c
View File

@@ -724,21 +724,20 @@ int __set_page_dirty_buffers(struct page *page)
} }
spin_unlock(&mapping->private_lock); spin_unlock(&mapping->private_lock);
if (!TestSetPageDirty(page)) { if (TestSetPageDirty(page))
return 0;
write_lock_irq(&mapping->tree_lock); write_lock_irq(&mapping->tree_lock);
if (page->mapping) { /* Race with truncate? */ if (page->mapping) { /* Race with truncate? */
if (mapping_cap_account_dirty(mapping)) if (mapping_cap_account_dirty(mapping))
__inc_zone_page_state(page, NR_FILE_DIRTY); __inc_zone_page_state(page, NR_FILE_DIRTY);
radix_tree_tag_set(&mapping->page_tree, radix_tree_tag_set(&mapping->page_tree,
page_index(page), page_index(page), PAGECACHE_TAG_DIRTY);
PAGECACHE_TAG_DIRTY);
} }
write_unlock_irq(&mapping->tree_lock); write_unlock_irq(&mapping->tree_lock);
__mark_inode_dirty(mapping->host, I_DIRTY_PAGES); __mark_inode_dirty(mapping->host, I_DIRTY_PAGES);
return 1; return 1;
} }
return 0;
}
EXPORT_SYMBOL(__set_page_dirty_buffers); EXPORT_SYMBOL(__set_page_dirty_buffers);
/* /*

26
mm/page-writeback.c
View File

@@ -761,23 +761,22 @@ int __set_page_dirty_nobuffers(struct page *page)
struct address_space *mapping = page_mapping(page); struct address_space *mapping = page_mapping(page);
struct address_space *mapping2; struct address_space *mapping2;
if (mapping) { if (!mapping)
return 1;
write_lock_irq(&mapping->tree_lock); write_lock_irq(&mapping->tree_lock);
mapping2 = page_mapping(page); mapping2 = page_mapping(page);
if (mapping2) { /* Race with truncate? */ if (mapping2) { /* Race with truncate? */
BUG_ON(mapping2 != mapping); BUG_ON(mapping2 != mapping);
if (mapping_cap_account_dirty(mapping)) if (mapping_cap_account_dirty(mapping))
__inc_zone_page_state(page, __inc_zone_page_state(page, NR_FILE_DIRTY);
NR_FILE_DIRTY);
radix_tree_tag_set(&mapping->page_tree, radix_tree_tag_set(&mapping->page_tree,
page_index(page), PAGECACHE_TAG_DIRTY); page_index(page), PAGECACHE_TAG_DIRTY);
} }
write_unlock_irq(&mapping->tree_lock); write_unlock_irq(&mapping->tree_lock);
if (mapping->host) { if (mapping->host) {
/* !PageAnon && !swapper_space */ /* !PageAnon && !swapper_space */
__mark_inode_dirty(mapping->host, __mark_inode_dirty(mapping->host, I_DIRTY_PAGES);
I_DIRTY_PAGES);
}
} }
return 1; return 1;
} }
@@ -851,12 +850,13 @@ int test_clear_page_dirty(struct page *page)
struct address_space *mapping = page_mapping(page); struct address_space *mapping = page_mapping(page);
unsigned long flags; unsigned long flags;
if (mapping) { if (!mapping)
return TestClearPageDirty(page);
write_lock_irqsave(&mapping->tree_lock, flags); write_lock_irqsave(&mapping->tree_lock, flags);
if (TestClearPageDirty(page)) { if (TestClearPageDirty(page)) {
radix_tree_tag_clear(&mapping->page_tree, radix_tree_tag_clear(&mapping->page_tree,
page_index(page), page_index(page), PAGECACHE_TAG_DIRTY);
PAGECACHE_TAG_DIRTY);
write_unlock_irqrestore(&mapping->tree_lock, flags); write_unlock_irqrestore(&mapping->tree_lock, flags);
/* /*
* We can continue to use `mapping' here because the * We can continue to use `mapping' here because the
@@ -871,8 +871,6 @@ int test_clear_page_dirty(struct page *page)
write_unlock_irqrestore(&mapping->tree_lock, flags); write_unlock_irqrestore(&mapping->tree_lock, flags);
return 0; return 0;
} }
return TestClearPageDirty(page);
}
EXPORT_SYMBOL(test_clear_page_dirty); EXPORT_SYMBOL(test_clear_page_dirty);
/* /*
@@ -893,7 +891,9 @@ int clear_page_dirty_for_io(struct page *page)
{ {
struct address_space *mapping = page_mapping(page); struct address_space *mapping = page_mapping(page);
if (mapping) { if (!mapping)
return TestClearPageDirty(page);
if (TestClearPageDirty(page)) { if (TestClearPageDirty(page)) {
if (mapping_cap_account_dirty(mapping)) { if (mapping_cap_account_dirty(mapping)) {
page_mkclean(page); page_mkclean(page);
@@ -903,8 +903,6 @@ int clear_page_dirty_for_io(struct page *page)
} }
return 0; return 0;
} }
return TestClearPageDirty(page);
}
EXPORT_SYMBOL(clear_page_dirty_for_io); EXPORT_SYMBOL(clear_page_dirty_for_io);
int test_clear_page_writeback(struct page *page) int test_clear_page_writeback(struct page *page)