android/android_kernel_cmhtcleo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "mm/fs: add hooks to support cleancache"

Browse Source 
This reverts commit 3d343ac32afc6eb933d98eb2dc4b3ad532de7f3a.
This commit is contained in:
SecureCRT 2012-08-20 23:10:46 +08:00
parent 7c50bd921f
commit f3a9b636b3
5 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/buffer.c Executable file → Normal file
View File

@ -41,7 +41,6 @@
#include <linux/bitops.h>
#include <linux/mpage.h>
#include <linux/bit_spinlock.h>
#include <linux/cleancache.h>
static int fsync_buffers_list(spinlock_t *lock, struct list_head *list);
@ -277,10 +276,6 @@ void invalidate_bdev(struct block_device *bdev)
invalidate_bh_lrus();
invalidate_mapping_pages(mapping, 0, -1);
/* 99% of the time, we don't need to flush the cleancache on the bdev.
* But, for the strange corners, lets be cautious
*/
cleancache_flush_inode(mapping);
}
EXPORT_SYMBOL(invalidate_bdev);

7
fs/mpage.c Executable file → Normal file
View File

@ -26,7 +26,6 @@
#include <linux/writeback.h>
#include <linux/backing-dev.h>
#include <linux/pagevec.h>
#include <linux/cleancache.h>
/*
* I/O completion handler for multipage BIOs.
@ -285,12 +284,6 @@ do_mpage_readpage(struct bio *bio, struct page *page, unsigned nr_pages,
} else if (fully_mapped) {
SetPageMappedToDisk(page);
}
if (fully_mapped && blocks_per_page == 1 && !PageUptodate(page) &&
cleancache_get_page(page) == 0) {
SetPageUptodate(page);
goto confused;
}
/*
* This page will go to BIO. Do we need to send this BIO off first?

3
fs/super.c Executable file → Normal file
View File

@ -38,7 +38,6 @@
#include <linux/mutex.h>
#include <linux/file.h>
#include <asm/uaccess.h>
#include <linux/cleancache.h>
#include "internal.h"
@ -105,7 +104,6 @@ static struct super_block *alloc_super(struct file_system_type *type)
s->s_qcop = sb_quotactl_ops;
s->s_op = &default_op;
s->s_time_gran = 1000000000;
s->cleancache_poolid = -1;
}
out:
return s;
@ -221,7 +219,6 @@ void deactivate_locked_super(struct super_block *s)
s->s_count -= S_BIAS-1;
spin_unlock(&sb_lock);
vfs_dq_off(s, 0);
cleancache_flush_fs(s);
fs->kill_sb(s);
put_filesystem(fs);
put_super(s);

11
mm/filemap.c Executable file → Normal file
View File

@ -34,7 +34,6 @@
#include <linux/hardirq.h> /* for BUG_ON(!in_atomic()) only */
#include <linux/memcontrol.h>
#include <linux/mm_inline.h> /* for page_is_file_cache() */
#include <linux/cleancache.h>
#include "internal.h"
/*
@ -120,16 +119,6 @@ void __remove_from_page_cache(struct page *page)
{
struct address_space *mapping = page->mapping;
/*
* if we're uptodate, flush out into the cleancache, otherwise
* invalidate any existing cleancache entries. We can't leave
* stale data around in the cleancache once our page is gone
*/
if (PageUptodate(page) && PageMappedToDisk(page))
cleancache_put_page(page);
else
cleancache_flush_page(mapping, page);
radix_tree_delete(&mapping->page_tree, page->index);
page->mapping = NULL;
mapping->nrpages--;

8
mm/truncate.c Executable file → Normal file
View File

@ -18,7 +18,6 @@
#include <linux/task_io_accounting_ops.h>
#include <linux/buffer_head.h> /* grr. try_to_release_page,
do_invalidatepage */
#include <linux/cleancache.h>
#include "internal.h"
@ -51,7 +50,6 @@ void do_invalidatepage(struct page *page, unsigned long offset)
static inline void truncate_partial_page(struct page *page, unsigned partial)
{
zero_user_segment(page, partial, PAGE_CACHE_SIZE);
cleancache_flush_page(page->mapping, page);
if (page_has_private(page))
do_invalidatepage(page, partial);
}
@ -215,8 +213,7 @@ void truncate_inode_pages_range(struct address_space *mapping,
struct pagevec pvec;
pgoff_t next;
int i;
cleancache_flush_inode(mapping);
if (mapping->nrpages == 0)
return;
@ -290,7 +287,6 @@ void truncate_inode_pages_range(struct address_space *mapping,
}
pagevec_release(&pvec);
}
cleancache_flush_inode(mapping);
}
EXPORT_SYMBOL(truncate_inode_pages_range);
@ -427,7 +423,6 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
int did_range_unmap = 0;
int wrapped = 0;
cleancache_flush_inode(mapping);
pagevec_init(&pvec, 0);
next = start;
while (next <= end && !wrapped &&
@ -484,7 +479,6 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
pagevec_release(&pvec);
cond_resched();
}
cleancache_flush_inode(mapping);
return ret;
}
EXPORT_SYMBOL_GPL(invalidate_inode_pages2_range);