From f8d7317ed4cf0bf96a02cbf00d40af17f7cbed1b Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 26 Jan 2010 17:27:20 +0100 Subject: [PATCH] --- yaml --- r: 185708 b: refs/heads/master c: 2ecdc82ef0b03e67ce5ecee79d0d108177a704df h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/f_mass_storage.c | 2 +- trunk/drivers/usb/gadget/file_storage.c | 2 +- trunk/include/linux/fs.h | 6 ------ trunk/mm/filemap.c | 2 +- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 56bf20ad9265..fe9572614715 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 270ba5f7c5dac0bfb564aa35a536fb31ad4075bd +refs/heads/master: 2ecdc82ef0b03e67ce5ecee79d0d108177a704df diff --git a/trunk/drivers/usb/gadget/f_mass_storage.c b/trunk/drivers/usb/gadget/f_mass_storage.c index a37640eba434..77fcd1b697e8 100644 --- a/trunk/drivers/usb/gadget/f_mass_storage.c +++ b/trunk/drivers/usb/gadget/f_mass_storage.c @@ -1041,7 +1041,7 @@ static void invalidate_sub(struct fsg_lun *curlun) unsigned long rc; rc = invalidate_mapping_pages(inode->i_mapping, 0, -1); - VLDBG(curlun, "invalidate_inode_pages -> %ld\n", rc); + VLDBG(curlun, "invalidate_mapping_pages -> %ld\n", rc); } static int do_verify(struct fsg_common *common) diff --git a/trunk/drivers/usb/gadget/file_storage.c b/trunk/drivers/usb/gadget/file_storage.c index 29dfb0277ffb..7dcdbda49cac 100644 --- a/trunk/drivers/usb/gadget/file_storage.c +++ b/trunk/drivers/usb/gadget/file_storage.c @@ -1448,7 +1448,7 @@ static void invalidate_sub(struct fsg_lun *curlun) unsigned long rc; rc = invalidate_mapping_pages(inode->i_mapping, 0, -1); - VLDBG(curlun, "invalidate_inode_pages -> %ld\n", rc); + VLDBG(curlun, "invalidate_mapping_pages -> %ld\n", rc); } static int do_verify(struct fsg_dev *fsg) diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index aa76dae673eb..d443c9dd3caa 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -2058,12 +2058,6 @@ extern int invalidate_inodes(struct super_block *); unsigned long invalidate_mapping_pages(struct address_space *mapping, pgoff_t start, pgoff_t end); -static inline unsigned long __deprecated -invalidate_inode_pages(struct address_space *mapping) -{ - return invalidate_mapping_pages(mapping, 0, ~0UL); -} - static inline void invalidate_remote_inode(struct inode *inode) { if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c index 698ea80f2102..148b52a5bb7e 100644 --- a/trunk/mm/filemap.c +++ b/trunk/mm/filemap.c @@ -1117,7 +1117,7 @@ static void do_generic_file_read(struct file *filp, loff_t *ppos, if (!PageUptodate(page)) { if (page->mapping == NULL) { /* - * invalidate_inode_pages got it + * invalidate_mapping_pages got it */ unlock_page(page); page_cache_release(page);