From ce68820cda4429da7bd103b739cd0f5cdfa5267e Mon Sep 17 00:00:00 2001 From: Cheng Renquan Date: Fri, 26 Mar 2010 18:04:40 +0800 Subject: [PATCH] --- yaml --- r: 198049 b: refs/heads/master c: 2d06eeb877581a7f53209af1582c5f66c799f0bd h: refs/heads/master i: 198047: 85dfe32cc78fa5f2d3bff5b8e99da91d04346ab4 v: v3 --- [refs] | 2 +- trunk/fs/ceph/mds_client.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3e83c8ca7c2c..432be2f21d95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c315c552c7442eab73461de61dbcce579a31d3a +refs/heads/master: 2d06eeb877581a7f53209af1582c5f66c799f0bd diff --git a/trunk/fs/ceph/mds_client.c b/trunk/fs/ceph/mds_client.c index ccb4141e306f..d549ab3adfda 100644 --- a/trunk/fs/ceph/mds_client.c +++ b/trunk/fs/ceph/mds_client.c @@ -2631,6 +2631,9 @@ int ceph_mdsc_init(struct ceph_mds_client *mdsc, struct ceph_client *client) mdsc->client = client; mutex_init(&mdsc->mutex); mdsc->mdsmap = kzalloc(sizeof(*mdsc->mdsmap), GFP_NOFS); + if (mdsc->mdsmap == NULL) + return -ENOMEM; + init_completion(&mdsc->safe_umount_waiters); init_completion(&mdsc->session_close_waiters); INIT_LIST_HEAD(&mdsc->waiting_for_map); @@ -2656,6 +2659,7 @@ int ceph_mdsc_init(struct ceph_mds_client *mdsc, struct ceph_client *client) init_waitqueue_head(&mdsc->cap_flushing_wq); spin_lock_init(&mdsc->dentry_lru_lock); INIT_LIST_HEAD(&mdsc->dentry_lru); + return 0; }