diff options
| author | Yan, Zheng <zheng.z.yan@intel.com> | 2014-07-30 10:12:47 +0800 |
|---|---|---|
| committer | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-08-07 14:30:00 +0400 |
| commit | 282c105225ec3229f344c5fced795b9e1e634440 (patch) | |
| tree | 6559e9991952537b75371f49f8ac17b65c41d6e2 /fs/ceph | |
| parent | 06fee30f6a31f106bed5d24d21eb8f1c4d8ba1fc (diff) | |
| download | linux-282c105225ec3229f344c5fced795b9e1e634440.tar.gz linux-282c105225ec3229f344c5fced795b9e1e634440.tar.bz2 linux-282c105225ec3229f344c5fced795b9e1e634440.zip | |
ceph: fix kick_requests()
__do_request() may unregister the request. So we should update
iterator 'p' before calling __do_request()
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/mds_client.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index fd8d7ca80e75..bad07c09f91e 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -2067,11 +2067,12 @@ static void __wake_requests(struct ceph_mds_client *mdsc, static void kick_requests(struct ceph_mds_client *mdsc, int mds) { struct ceph_mds_request *req; - struct rb_node *p; + struct rb_node *p = rb_first(&mdsc->request_tree); dout("kick_requests mds%d\n", mds); - for (p = rb_first(&mdsc->request_tree); p; p = rb_next(p)) { + while (p) { req = rb_entry(p, struct ceph_mds_request, r_node); + p = rb_next(p); if (req->r_got_unsafe) continue; if (req->r_session && |