summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-06-09 09:14:34 +0200
committerIngo Molnar <mingo@elte.hu>2011-06-09 09:14:34 +0200
commit5f127133ee432d0b83ee26e8e3a3d7828ab5f2b1 (patch)
tree375df8d09e6397eabd61374f4eb422fac04a22a5 /fs
parent5cf42f7055648aaba68ce95ecec69128d7fbf65f (diff)
parentfe47ae7f53e179d2ef6771024feb000cbb86640f (diff)
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
Diffstat (limited to 'fs')
-rw-r--r--fs/dcookies.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/dcookies.c b/fs/dcookies.c
index a21cabdbd87..dda0dc702d1 100644
--- 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;