From: Sage Weil <sage@newdream.net>
Date: Thu, 26 Aug 2010 16:26:37 +0000 (-0700)
Subject: ceph: don't BUG on ENOMEM during mds reconnect
X-Git-Tag: upstream/snapshot3+hdmi~13120^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e072f8aa3587710cd35cce0f6b6efd7b4276c327;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

ceph: don't BUG on ENOMEM during mds reconnect

We are in a position to return an error; do that instead.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 8d1f11c..f091b13 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -2324,7 +2324,7 @@ static int encode_caps_cb(struct inode *inode, struct ceph_cap *cap,
 		path = ceph_mdsc_build_path(dentry, &pathlen, &pathbase, 0);
 		if (IS_ERR(path)) {
 			err = PTR_ERR(path);
-			BUG_ON(err);
+			goto out_dput;
 		}
 	} else {
 		path = NULL;
@@ -2332,7 +2332,7 @@ static int encode_caps_cb(struct inode *inode, struct ceph_cap *cap,
 	}
 	err = ceph_pagelist_encode_string(pagelist, path, pathlen);
 	if (err)
-		goto out;
+		goto out_free;
 
 	spin_lock(&inode->i_lock);
 	cap->seq = 0;        /* reset cap seq */
@@ -2376,8 +2376,9 @@ static int encode_caps_cb(struct inode *inode, struct ceph_cap *cap,
 		unlock_kernel();
 	}
 
-out:
+out_free:
 	kfree(path);
+out_dput:
 	dput(dentry);
 	return err;
 }