From bd322fb1b6d20313c869ccabbb6051fb8d403c3b Mon Sep 17 00:00:00 2001
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Date: Tue, 5 Oct 2010 16:03:41 +0530
Subject: [PATCH] --- yaml --- r: 211388 b: refs/heads/master c:
 92923dcbfcad107b0e0469f579a2455729ccf10e h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/fs/ceph/export.c | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 0a392576f24e..de0fe4c180b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bc18876ba01fd4a077db6e1ed27201e4bda8864
+refs/heads/master: 92923dcbfcad107b0e0469f579a2455729ccf10e
diff --git a/trunk/fs/ceph/export.c b/trunk/fs/ceph/export.c
index 4480cb1c63e7..387c5823944e 100644
--- a/trunk/fs/ceph/export.c
+++ b/trunk/fs/ceph/export.c
@@ -42,32 +42,34 @@ struct ceph_nfs_confh {
 static int ceph_encode_fh(struct dentry *dentry, u32 *rawfh, int *max_len,
 			  int connectable)
 {
+	int type;
 	struct ceph_nfs_fh *fh = (void *)rawfh;
 	struct ceph_nfs_confh *cfh = (void *)rawfh;
 	struct dentry *parent = dentry->d_parent;
 	struct inode *inode = dentry->d_inode;
-	int type;
+	int connected_handle_length = sizeof(*cfh)/4;
+	int handle_length = sizeof(*fh)/4;
 
 	/* don't re-export snaps */
 	if (ceph_snap(inode) != CEPH_NOSNAP)
 		return -EINVAL;
 
-	if (*max_len >= sizeof(*cfh)) {
+	if (*max_len >= connected_handle_length) {
 		dout("encode_fh %p connectable\n", dentry);
 		cfh->ino = ceph_ino(dentry->d_inode);
 		cfh->parent_ino = ceph_ino(parent->d_inode);
 		cfh->parent_name_hash = parent->d_name.hash;
-		*max_len = sizeof(*cfh);
+		*max_len = connected_handle_length;
 		type = 2;
-	} else if (*max_len > sizeof(*fh)) {
+	} else if (*max_len >= handle_length) {
 		if (connectable)
-			return -ENOSPC;
+			return 255;
 		dout("encode_fh %p\n", dentry);
 		fh->ino = ceph_ino(dentry->d_inode);
-		*max_len = sizeof(*fh);
+		*max_len = handle_length;
 		type = 1;
 	} else {
-		return -ENOSPC;
+		return 255;
 	}
 	return type;
 }