1 files changed, 5 insertions, 5 deletions

diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index e1f465a389d5..4ea71eba40a5 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -213,12 +213,12 @@ hugetlbfs_read_actor(struct page *page, unsigned long offset,
         int i, chunksize;
 
         /* Find which 4k chunk and offset with in that chunk */
-        i = offset >> PAGE_CACHE_SHIFT;
-        offset = offset & ~PAGE_CACHE_MASK;
+        i = offset >> PAGE_SHIFT;
+        offset = offset & ~PAGE_MASK;
 
         while (size) {
                 size_t n;
-                chunksize = PAGE_CACHE_SIZE;
+                chunksize = PAGE_SIZE;
                 if (offset)
                         chunksize -= offset;
                 if (chunksize > size)
@@ -237,7 +237,7 @@ hugetlbfs_read_actor(struct page *page, unsigned long offset,
 /*
  * Support for read() - Find the page attached to f_mapping and copy out the
  * data. Its *very* similar to do_generic_mapping_read(), we can't use that
- * since it has PAGE_CACHE_SIZE assumptions.
+ * since it has PAGE_SIZE assumptions.
  */
 static ssize_t hugetlbfs_read_iter(struct kiocb *iocb, struct iov_iter *to)
 {
@@ -285,7 +285,7 @@ static ssize_t hugetlbfs_read_iter(struct kiocb *iocb, struct iov_iter *to)
                          * We have the page, copy it to user space buffer.
                          */
                         copied = hugetlbfs_read_actor(page, offset, to, nr);
-                        page_cache_release(page);
+                        put_page(page);
                 }
                 offset += copied;
                 retval += copied;