Merge branch 'next' into for-linus-3.0

[pandora-kernel.git] / fs / dcookies.c

diff --git a/fs/dcookies.c b/fs/dcookies.c
index a21cabd..dda0dc7 100644 (file)
--- a/fs/dcookies.c
+++ b/fs/dcookies.c
@@ -178,6 +178,8 @@ SYSCALL_DEFINE(lookup_dcookie)(u64 cookie64, char __user * buf, size_t len)
        /* FIXME: (deleted) ? */
        path = d_path(&dcs->path, kbuf, PAGE_SIZE);
 
+       mutex_unlock(&dcookie_mutex);
+
        if (IS_ERR(path)) {
                err = PTR_ERR(path);
                goto out_free;
@@ -194,6 +196,7 @@ SYSCALL_DEFINE(lookup_dcookie)(u64 cookie64, char __user * buf, size_t len)
 
 out_free:
        kfree(kbuf);
+       return err;
 out:
        mutex_unlock(&dcookie_mutex);
        return err;