Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / fs / overlayfs / export.c

diff --git a/fs/overlayfs/export.c b/fs/overlayfs/export.c
index cb8ec1f65c030b8164f859019adf8941d51d76ab..73c9775215b33ba043468f57d6cb618fbcffe477 100644 (file)
--- a/fs/overlayfs/export.c
+++ b/fs/overlayfs/export.c
@@ -227,9 +227,8 @@ static int ovl_d_to_fh(struct dentry *dentry, char *buf, int buflen)
        /* Encode an upper or lower file handle */
        fh = ovl_encode_real_fh(enc_lower ? ovl_dentry_lower(dentry) :
                                ovl_dentry_upper(dentry), !enc_lower);
-       err = PTR_ERR(fh);
        if (IS_ERR(fh))
-               goto fail;
+               return PTR_ERR(fh);
 
        err = -EOVERFLOW;
        if (fh->len > buflen)