diff options
-rw-r--r-- | drivers/usb/gadget/f_mass_storage.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/file_storage.c | 2 | ||||
-rw-r--r-- | include/linux/fs.h | 6 | ||||
-rw-r--r-- | mm/filemap.c | 2 |
4 files changed, 3 insertions, 9 deletions
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index a37640eba434..77fcd1b697e8 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c | |||
@@ -1041,7 +1041,7 @@ static void invalidate_sub(struct fsg_lun *curlun) | |||
1041 | unsigned long rc; | 1041 | unsigned long rc; |
1042 | 1042 | ||
1043 | rc = invalidate_mapping_pages(inode->i_mapping, 0, -1); | 1043 | rc = invalidate_mapping_pages(inode->i_mapping, 0, -1); |
1044 | VLDBG(curlun, "invalidate_inode_pages -> %ld\n", rc); | 1044 | VLDBG(curlun, "invalidate_mapping_pages -> %ld\n", rc); |
1045 | } | 1045 | } |
1046 | 1046 | ||
1047 | static int do_verify(struct fsg_common *common) | 1047 | static int do_verify(struct fsg_common *common) |
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c index 29dfb0277ffb..7dcdbda49cac 100644 --- a/drivers/usb/gadget/file_storage.c +++ b/drivers/usb/gadget/file_storage.c | |||
@@ -1448,7 +1448,7 @@ static void invalidate_sub(struct fsg_lun *curlun) | |||
1448 | unsigned long rc; | 1448 | unsigned long rc; |
1449 | 1449 | ||
1450 | rc = invalidate_mapping_pages(inode->i_mapping, 0, -1); | 1450 | rc = invalidate_mapping_pages(inode->i_mapping, 0, -1); |
1451 | VLDBG(curlun, "invalidate_inode_pages -> %ld\n", rc); | 1451 | VLDBG(curlun, "invalidate_mapping_pages -> %ld\n", rc); |
1452 | } | 1452 | } |
1453 | 1453 | ||
1454 | static int do_verify(struct fsg_dev *fsg) | 1454 | static int do_verify(struct fsg_dev *fsg) |
diff --git a/include/linux/fs.h b/include/linux/fs.h index aa76dae673eb..d443c9dd3caa 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -2058,12 +2058,6 @@ extern int invalidate_inodes(struct super_block *); | |||
2058 | unsigned long invalidate_mapping_pages(struct address_space *mapping, | 2058 | unsigned long invalidate_mapping_pages(struct address_space *mapping, |
2059 | pgoff_t start, pgoff_t end); | 2059 | pgoff_t start, pgoff_t end); |
2060 | 2060 | ||
2061 | static inline unsigned long __deprecated | ||
2062 | invalidate_inode_pages(struct address_space *mapping) | ||
2063 | { | ||
2064 | return invalidate_mapping_pages(mapping, 0, ~0UL); | ||
2065 | } | ||
2066 | |||
2067 | static inline void invalidate_remote_inode(struct inode *inode) | 2061 | static inline void invalidate_remote_inode(struct inode *inode) |
2068 | { | 2062 | { |
2069 | if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || | 2063 | if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || |
diff --git a/mm/filemap.c b/mm/filemap.c index 698ea80f2102..148b52a5bb7e 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -1117,7 +1117,7 @@ readpage: | |||
1117 | if (!PageUptodate(page)) { | 1117 | if (!PageUptodate(page)) { |
1118 | if (page->mapping == NULL) { | 1118 | if (page->mapping == NULL) { |
1119 | /* | 1119 | /* |
1120 | * invalidate_inode_pages got it | 1120 | * invalidate_mapping_pages got it |
1121 | */ | 1121 | */ |
1122 | unlock_page(page); | 1122 | unlock_page(page); |
1123 | page_cache_release(page); | 1123 | page_cache_release(page); |