diff options
| author | Yan, Zheng <zyan@redhat.com> | 2015-04-07 03:51:08 -0400 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2015-04-22 11:33:31 -0400 |
| commit | c0bd50e2eeddf139d8f61e709d7003210301e93a (patch) | |
| tree | abb39df3a25758ce80e0d6f19b821d208dcd640e /fs | |
| parent | 32ec4397756d072873ee778cbf41b9f6a335b953 (diff) | |
ceph: fix null pointer dereference in send_mds_reconnect()
sb->s_root can be null when umounting
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/mds_client.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index fd5585b8d382..0a2eb32ffe43 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c | |||
| @@ -2892,7 +2892,8 @@ static void send_mds_reconnect(struct ceph_mds_client *mdsc, | |||
| 2892 | spin_unlock(&session->s_cap_lock); | 2892 | spin_unlock(&session->s_cap_lock); |
| 2893 | 2893 | ||
| 2894 | /* trim unused caps to reduce MDS's cache rejoin time */ | 2894 | /* trim unused caps to reduce MDS's cache rejoin time */ |
| 2895 | shrink_dcache_parent(mdsc->fsc->sb->s_root); | 2895 | if (mdsc->fsc->sb->s_root) |
| 2896 | shrink_dcache_parent(mdsc->fsc->sb->s_root); | ||
| 2896 | 2897 | ||
| 2897 | ceph_con_close(&session->s_con); | 2898 | ceph_con_close(&session->s_con); |
| 2898 | ceph_con_open(&session->s_con, | 2899 | ceph_con_open(&session->s_con, |