diff --git a/[refs] b/[refs] index 5a9806e8fa91..788483f0e883 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c423956b8a495f0c048143abc5da955a70eac97 +refs/heads/master: 4736b009b880b7c19bea36327a71032a6dbee402 diff --git a/trunk/fs/ceph/mds_client.c b/trunk/fs/ceph/mds_client.c index b6b5348055fc..ad0fbc3128d3 100644 --- a/trunk/fs/ceph/mds_client.c +++ b/trunk/fs/ceph/mds_client.c @@ -328,6 +328,8 @@ static struct ceph_mds_session *register_session(struct ceph_mds_client *mdsc, struct ceph_mds_session *s; s = kzalloc(sizeof(*s), GFP_NOFS); + if (!s) + return ERR_PTR(-ENOMEM); s->s_mdsc = mdsc; s->s_mds = mds; s->s_state = CEPH_MDS_SESSION_NEW;