xfs: don't try to handle non-update pages in xfile_obj_load

shmem_read_mapping_page_gfp always returns an uptodate page or an
ERR_PTR.  Remove the code that tries to handle a non-uptodate page.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>

diff --git a/fs/xfs/scrub/xfile.c b/fs/xfs/scrub/xfile.c
index c15cc88..4ec9759 100644 (file)
--- a/fs/xfs/scrub/xfile.c
+++ b/fs/xfs/scrub/xfile.c
@@ -149,18 +149,14 @@ xfile_load(
                        goto advance;
                }
 
-               if (PageUptodate(page)) {
-                       /*
-                        * xfile pages must never be mapped into userspace, so
-                        * we skip the dcache flush.
-                        */
-                       kaddr = kmap_local_page(page);
-                       p = kaddr + offset_in_page(pos);
-                       memcpy(buf, p, len);
-                       kunmap_local(kaddr);
-               } else {
-                       memset(buf, 0, len);
-               }
+               /*
+                * xfile pages must never be mapped into userspace, so
+                * we skip the dcache flush.
+                */
+               kaddr = kmap_local_page(page);
+               p = kaddr + offset_in_page(pos);
+               memcpy(buf, p, len);
+               kunmap_local(kaddr);
                put_page(page);
 
 advance: