diff options
author | Sage Weil <sage@newdream.net> | 2010-03-20 23:43:28 -0400 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2010-03-23 10:47:04 -0400 |
commit | 9c423956b8a495f0c048143abc5da955a70eac97 (patch) | |
tree | 4577ebc496d6e2aea708cced214789113fbd75ba | |
parent | 8f883c24de33ba929c95e018ac0ba66e4f46734b (diff) |
ceph: propagate mds session allocation failures to caller
Return error to original caller if register_session() fails.
Signed-off-by: Sage Weil <sage@newdream.net>
-rw-r--r-- | fs/ceph/mds_client.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 5cbf46abfee3..b6b5348055fc 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c | |||
@@ -1567,8 +1567,13 @@ static int __do_request(struct ceph_mds_client *mdsc, | |||
1567 | 1567 | ||
1568 | /* get, open session */ | 1568 | /* get, open session */ |
1569 | session = __ceph_lookup_mds_session(mdsc, mds); | 1569 | session = __ceph_lookup_mds_session(mdsc, mds); |
1570 | if (!session) | 1570 | if (!session) { |
1571 | session = register_session(mdsc, mds); | 1571 | session = register_session(mdsc, mds); |
1572 | if (IS_ERR(session)) { | ||
1573 | err = PTR_ERR(session); | ||
1574 | goto finish; | ||
1575 | } | ||
1576 | } | ||
1572 | dout("do_request mds%d session %p state %s\n", mds, session, | 1577 | dout("do_request mds%d session %p state %s\n", mds, session, |
1573 | session_state_name(session->s_state)); | 1578 | session_state_name(session->s_state)); |
1574 | if (session->s_state != CEPH_MDS_SESSION_OPEN && | 1579 | if (session->s_state != CEPH_MDS_SESSION_OPEN && |