diff --git a/[refs] b/[refs]
index 5c615993c618..e7cb00b7211d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5449bc94152a6c4700f46786be600141234d8f0f
+refs/heads/master: 54bc485522afdac33de5504da2ea8cdcc690674e
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index 822c545c7209..a1180d05ed96 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -1573,7 +1573,13 @@ extern int invalidate_partition(struct gendisk *, int);
 extern int invalidate_inodes(struct super_block *);
 unsigned long invalidate_mapping_pages(struct address_space *mapping,
 					pgoff_t start, pgoff_t end);
-unsigned long invalidate_inode_pages(struct address_space *mapping);
+
+static inline unsigned long
+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/truncate.c b/trunk/mm/truncate.c
index 5df947de7654..85105db34609 100644
--- a/trunk/mm/truncate.c
+++ b/trunk/mm/truncate.c
@@ -310,12 +310,7 @@ unsigned long invalidate_mapping_pages(struct address_space *mapping,
 	}
 	return ret;
 }
-
-unsigned long invalidate_inode_pages(struct address_space *mapping)
-{
-	return invalidate_mapping_pages(mapping, 0, ~0UL);
-}
-EXPORT_SYMBOL(invalidate_inode_pages);
+EXPORT_SYMBOL(invalidate_mapping_pages);
 
 /*
  * This is like invalidate_complete_page(), except it ignores the page's