diff options
| author | Joel Becker <jlbec@evilplan.org> | 2011-08-22 00:02:57 -0400 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2011-08-22 00:02:57 -0400 |
| commit | 99b1bb61b225c3eb4d3b196d4f1d041695b19a7e (patch) | |
| tree | 06cabdc34538f3b38a39e3b802ecc1a2ab2aae00 /fs/dcookies.c | |
| parent | c7e25e6e0b0486492c5faaf6312b37413642c48e (diff) | |
| parent | 93862d5e1ab875664c6cc95254fc365028a48bb1 (diff) | |
Merge branch 'mw-3.1-jul25' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-fixes
Diffstat (limited to 'fs/dcookies.c')
| -rw-r--r-- | fs/dcookies.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/dcookies.c b/fs/dcookies.c index a21cabdbd87b..dda0dc702d1b 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) | |||
| 178 | /* FIXME: (deleted) ? */ | 178 | /* FIXME: (deleted) ? */ |
| 179 | path = d_path(&dcs->path, kbuf, PAGE_SIZE); | 179 | path = d_path(&dcs->path, kbuf, PAGE_SIZE); |
| 180 | 180 | ||
| 181 | mutex_unlock(&dcookie_mutex); | ||
| 182 | |||
| 181 | if (IS_ERR(path)) { | 183 | if (IS_ERR(path)) { |
| 182 | err = PTR_ERR(path); | 184 | err = PTR_ERR(path); |
| 183 | goto out_free; | 185 | goto out_free; |
| @@ -194,6 +196,7 @@ SYSCALL_DEFINE(lookup_dcookie)(u64 cookie64, char __user * buf, size_t len) | |||
| 194 | 196 | ||
| 195 | out_free: | 197 | out_free: |
| 196 | kfree(kbuf); | 198 | kfree(kbuf); |
| 199 | return err; | ||
| 197 | out: | 200 | out: |
| 198 | mutex_unlock(&dcookie_mutex); | 201 | mutex_unlock(&dcookie_mutex); |
| 199 | return err; | 202 | return err; |