Merge tag 'ceph-for-5.7-rc8' of git://github.com/ceph/ceph-client (e2fce151) · Commits · 戴 / test

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

fs/ceph/caps.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3991,7 +3991,7 @@ void ceph_handle_caps(struct ceph_mds_session *session,
		__ceph_queue_cap_release(session, cap);
		spin_unlock(&session->s_cap_lock);
		}
		goto done;
		goto flush_cap_releases;
		}

		/* these will work even if we don't have a cap yet */

net/ceph/osd_client.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -3649,7 +3649,9 @@ static void handle_reply(struct ceph_osd osd, struct ceph_msg msg)
		* supported.
		*/
		req->r_t.target_oloc.pool = m.redirect.oloc.pool;
		req->r_flags \|= CEPH_OSD_FLAG_REDIRECTED;
		req->r_flags \|= CEPH_OSD_FLAG_REDIRECTED \|
		CEPH_OSD_FLAG_IGNORE_OVERLAY \|
		CEPH_OSD_FLAG_IGNORE_CACHE;
		req->r_tid = 0;
		__submit_request(req, false);
		goto out_unlock_osdc;

Admin message