History

Merge tag 'ceph-for-5.7-rc8' of git://github.com/ceph/ceph-client

Pull ceph fixes from Ilya Dryomov: "Cache tiering and cap handling fixups, both marked for stable" * tag 'ceph-for-5.7-rc8' of git://github.com/ceph/ceph-client: ceph: flush release queue when handling caps for unknown inode libceph: ignore pool overlay and cache logic on redirects

Linus Torvalds committed 6 years ago

Commit e2fce152 parents 835e36b fb33c112 files · +4 −2Browse files

Unified · Split

2 files
  1. fs/ceph/caps.c +1 −1
  2. net/ceph/osd_client.c +3 −1
fs/ceph/caps.c+1−1
@@ -3991,7 +3991,7 @@ void ceph_handle_caps(struct ceph_mds_session *session, · 3990 unmodified lines
3991 __ceph_queue_cap_release(session, cap);3991 __ceph_queue_cap_release(session, cap);
3992 spin_unlock(&session->s_cap_lock);3992 spin_unlock(&session->s_cap_lock);
3993 }3993 }
3994 goto done;3994 goto flush_cap_releases;
3995 }3995 }
3996 3996
3997 /* these will work even if we don't have a cap yet */3997 /* these will work even if we don't have a cap yet */
net/ceph/osd_client.c+3−1
@@ -3649,7 +3649,9 @@ static void handle_reply(struct ceph_osd *osd, struct ceph_msg *msg) · 3648 unmodified lines
3649 * supported.3649 * supported.
3650 */3650 */
3651 req->r_t.target_oloc.pool = m.redirect.oloc.pool;3651 req->r_t.target_oloc.pool = m.redirect.oloc.pool;
3652 req->r_flags |= CEPH_OSD_FLAG_REDIRECTED;3652 req->r_flags |= CEPH_OSD_FLAG_REDIRECTED |
3653 CEPH_OSD_FLAG_IGNORE_OVERLAY |
3654 CEPH_OSD_FLAG_IGNORE_CACHE;
3653 req->r_tid = 0;3655 req->r_tid = 0;
3654 __submit_request(req, false);3656 __submit_request(req, false);
3655 goto out_unlock_osdc;3657 goto out_unlock_osdc;