fix

diff --git a/kernel/configure.ac b/kernel/configure.ac
index 62c2b2ffef82cdb0206c78e4af801116a561348d..a27cecaedf79c58dfd69c72cf83351f117e1cf08 100644 (file)
--- a/kernel/configure.ac
+++ b/kernel/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(fuse-kernel, 2.2)
+AC_INIT(fuse-kernel, 2.2.1)
 AC_CONFIG_HEADERS([config.h])
 
 AC_PROG_INSTALL

diff --git a/kernel/inode.c b/kernel/inode.c
index f702a4a1f8514d83d7661a66833b83c333ef3a3b..d935d588f6133ddfc2d99c39f0dd601798b0e3d2 100644 (file)
--- a/kernel/inode.c
+++ b/kernel/inode.c
@@ -520,34 +520,30 @@ static struct inode *get_root_inode(struct super_block *sb, unsigned mode)
 #ifdef KERNEL_2_6
 static struct dentry *fuse_get_dentry(struct super_block *sb, void *vobjp)
 {
-       int err;
        __u32 *objp = vobjp;
        unsigned long nodeid = objp[0];
        __u32 generation = objp[1];
        struct inode *inode;
        struct dentry *entry;
 
-       err = -ESTALE;
        if (nodeid == 0)
-               goto error;
+               return ERR_PTR(-ESTALE);
 
        inode = ilookup5(sb, nodeid, fuse_inode_eq, &nodeid);
        if (!inode)
-               goto error;
-       if (inode->i_generation != generation)
-               goto error_iput;
+               return ERR_PTR(-ESTALE);
+       if (inode->i_generation != generation) {
+               iput(inode);
+               return ERR_PTR(-ESTALE);
+       }
 
-       err = -ENOMEM;
        entry = d_alloc_anon(inode);
-       if (!entry)
-               goto error_iput;
+       if (!entry) {
+               iput(inode);
+               return ERR_PTR(-ENOMEM);
+       }
 
        return entry;
-
- error_iput:
-       iput(inode);
- error:
-       return ERR_PTR(err);
 }
 
 static int fuse_encode_fh(struct dentry *dentry, __u32 *fh, int *max_len,