diff options
| author | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2010-10-05 16:03:41 +0530 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-10-07 08:00:23 -0700 |
| commit | 92923dcbfcad107b0e0469f579a2455729ccf10e (patch) | |
| tree | a16b4b1510af3c57acfa483d8f88cb5d0ba41d98 /fs | |
| parent | 6bc18876ba01fd4a077db6e1ed27201e4bda8864 (diff) | |
| download | linux-3.10-92923dcbfcad107b0e0469f579a2455729ccf10e.tar.gz linux-3.10-92923dcbfcad107b0e0469f579a2455729ccf10e.tar.bz2 linux-3.10-92923dcbfcad107b0e0469f579a2455729ccf10e.zip | |
ceph: Fix return value of encode_fh function
encode_fh function should return 255 on error as done by other file
system to indicate EOVERFLOW. Also max_len is in sizeof(u32) units
and not in bytes.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/export.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/fs/ceph/export.c b/fs/ceph/export.c index 4480cb1c63e..387c5823944 100644 --- a/fs/ceph/export.c +++ b/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; } |