Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 347601
b: refs/heads/master
c: cfc84c9
h: refs/heads/master
i:
  347599: 1297d16
v: v3
  • Loading branch information
Cyril Roelandt authored and Alex Elder committed Dec 13, 2012
1 parent c835643 commit 7c3fc33
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 22cddde104d715600a4c218bf9224923208afe90
refs/heads/master: cfc84c9f73ab8a6933bd4f36efac1196cddad581
4 changes: 3 additions & 1 deletion trunk/fs/ceph/export.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,15 @@ static int ceph_encode_fh(struct inode *inode, u32 *rawfh, int *max_len,
struct ceph_nfs_confh *cfh = (void *)rawfh;
int connected_handle_length = sizeof(*cfh)/4;
int handle_length = sizeof(*fh)/4;
struct dentry *dentry = d_find_alias(inode);
struct dentry *dentry;
struct dentry *parent;

/* don't re-export snaps */
if (ceph_snap(inode) != CEPH_NOSNAP)
return -EINVAL;

dentry = d_find_alias(inode);

/* if we found an alias, generate a connectable fh */
if (*max_len >= connected_handle_length && dentry) {
dout("encode_fh %p connectable\n", dentry);
Expand Down

0 comments on commit 7c3fc33

Please sign in to comment.