diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-11 12:17:30 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-11 12:17:30 -0800 |
commit | f87092c4337fc064b52bfad1df499a5b82f6d088 (patch) | |
tree | d12c230e022c00505a85a6b0a12d5a154c7f32df /fs/ceph/addr.c | |
parent | 40a31da414c39e3cd8c4137c1ceedf59b7ffd4ce (diff) | |
parent | 85f5a4d666fd9be73856ed16bb36c5af5b406b29 (diff) | |
download | linux-f87092c4337fc064b52bfad1df499a5b82f6d088.tar.bz2 |
Merge tag 'ceph-for-5.0-rc2' of git://github.com/ceph/ceph-client
Pull ceph updates from Ilya Dryomov:
"A patch to allow setting abort_on_full and a fix for an old "rbd
unmap" edge case, marked for stable"
* tag 'ceph-for-5.0-rc2' of git://github.com/ceph/ceph-client:
rbd: don't return 0 on unmap if RBD_DEV_FLAG_REMOVING is set
ceph: use vmf_error() in ceph_filemap_fault()
libceph: allow setting abort_on_full for rbd
Diffstat (limited to 'fs/ceph/addr.c')
-rw-r--r-- | fs/ceph/addr.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 5d0c05e288cc..a47c541f8006 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -1494,10 +1494,7 @@ static vm_fault_t ceph_filemap_fault(struct vm_fault *vmf) if (err < 0 || off >= i_size_read(inode)) { unlock_page(page); put_page(page); - if (err == -ENOMEM) - ret = VM_FAULT_OOM; - else - ret = VM_FAULT_SIGBUS; + ret = vmf_error(err); goto out_inline; } if (err < PAGE_SIZE) |