Merge tag 'irq-urgent-2020-11-08' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / fs / ceph / addr.c

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 97827f6..35c83f6 100644 (file)
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -241,7 +241,6 @@ static int ceph_do_readpage(struct file *filp, struct page *page)
        if (err == -ENOENT)
                err = 0;
        if (err < 0) {
-               SetPageError(page);
                ceph_fscache_readpage_cancel(inode, page);
                if (err == -EBLOCKLISTED)
                        fsc->blocklisted = true;
@@ -1472,7 +1471,7 @@ static vm_fault_t ceph_filemap_fault(struct vm_fault *vmf)
        struct ceph_inode_info *ci = ceph_inode(inode);
        struct ceph_file_info *fi = vma->vm_file->private_data;
        struct page *pinned_page = NULL;
-       loff_t off = vmf->pgoff << PAGE_SHIFT;
+       loff_t off = (loff_t)vmf->pgoff << PAGE_SHIFT;
        int want, got, err;
        sigset_t oldset;
        vm_fault_t ret = VM_FAULT_SIGBUS;