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
39913991 __ceph_queue_cap_release(session, cap);
39923992 spin_unlock(&session->s_cap_lock);
39933993 }
3994− goto done;
3994+ goto flush_cap_releases;
39953995 }
39963996
39973997 /* 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
36493649 * supported.
36503650 */
36513651 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;
36533655 req->r_tid = 0;
36543656 __submit_request(req, false);
36553657 goto out_unlock_osdc;