git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/swiotlb-0.9' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
fs
/
ceph
/
export.c
diff --git
a/fs/ceph/export.c
b/fs/ceph/export.c
index
387c582
..
2297d94
100644
(file)
--- a/
fs/ceph/export.c
+++ b/
fs/ceph/export.c
@@
-1,10
+1,11
@@
-#include
"ceph_debug.h"
+#include
<linux/ceph/ceph_debug.h>
#include <linux/exportfs.h>
#include <linux/slab.h>
#include <asm/unaligned.h>
#include "super.h"
#include <linux/exportfs.h>
#include <linux/slab.h>
#include <asm/unaligned.h>
#include "super.h"
+#include "mds_client.h"
/*
* NFS export support
/*
* NFS export support
@@
-62,13
+63,16
@@
static int ceph_encode_fh(struct dentry *dentry, u32 *rawfh, int *max_len,
*max_len = connected_handle_length;
type = 2;
} else if (*max_len >= handle_length) {
*max_len = connected_handle_length;
type = 2;
} else if (*max_len >= handle_length) {
- if (connectable)
+ if (connectable) {
+ *max_len = connected_handle_length;
return 255;
return 255;
+ }
dout("encode_fh %p\n", dentry);
fh->ino = ceph_ino(dentry->d_inode);
*max_len = handle_length;
type = 1;
} else {
dout("encode_fh %p\n", dentry);
fh->ino = ceph_ino(dentry->d_inode);
*max_len = handle_length;
type = 1;
} else {
+ *max_len = handle_length;
return 255;
}
return type;
return 255;
}
return type;
@@
-117,7
+121,7
@@
static struct dentry *__fh_to_dentry(struct super_block *sb,
static struct dentry *__cfh_to_dentry(struct super_block *sb,
struct ceph_nfs_confh *cfh)
{
static struct dentry *__cfh_to_dentry(struct super_block *sb,
struct ceph_nfs_confh *cfh)
{
- struct ceph_mds_client *mdsc =
&
ceph_sb_to_client(sb)->mdsc;
+ struct ceph_mds_client *mdsc = ceph_sb_to_client(sb)->mdsc;
struct inode *inode;
struct dentry *dentry;
struct ceph_vino vino;
struct inode *inode;
struct dentry *dentry;
struct ceph_vino vino;