leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2020-05-29 13:59:54 -07:00
parent 835e36b119 fb33c114d3
commit e2fce151d2
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ceph/caps.c
View File

@@ -3991,7 +3991,7 @@ void ceph_handle_caps(struct ceph_mds_session *session,
__ceph_queue_cap_release(session, cap); __ceph_queue_cap_release(session, cap);
spin_unlock(&session->s_cap_lock); spin_unlock(&session->s_cap_lock);
} }
goto done; goto flush_cap_releases;
} }
/* these will work even if we don't have a cap yet */ /* these will work even if we don't have a cap yet */

4
net/ceph/osd_client.c
View File

@@ -3649,7 +3649,9 @@ static void handle_reply(struct ceph_osd *osd, struct ceph_msg *msg)
* supported. * supported.
*/ */
req->r_t.target_oloc.pool = m.redirect.oloc.pool; 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; req->r_tid = 0;
__submit_request(req, false); __submit_request(req, false);
goto out_unlock_osdc; goto out_unlock_osdc;