diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-08 11:09:11 +0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-08 11:09:11 +0400 |
| commit | 32bc6e095d75233e7c87cc6fa0e07942b124d194 (patch) | |
| tree | 8f83ef9a23d52d1305878b65dd98fc22b09b7f3e /fs/nfs/namespace.c | |
| parent | 5cf13911b1e72707b6f0eb39b2d819ec6e343d76 (diff) | |
| parent | 81b73dd92b97423b8f5324a59044da478c04f4c4 (diff) | |
| download | linux-32bc6e095d75233e7c87cc6fa0e07942b124d194.tar.xz | |
Merge branch 'merge'
Diffstat (limited to 'fs/nfs/namespace.c')
| -rw-r--r-- | fs/nfs/namespace.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c index 19b98ca468eb..86b3169c8cac 100644 --- a/fs/nfs/namespace.c +++ b/fs/nfs/namespace.c @@ -51,7 +51,7 @@ char *nfs_path(const char *base, const struct dentry *dentry, namelen = dentry->d_name.len; buflen -= namelen + 1; if (buflen < 0) - goto Elong; + goto Elong_unlock; end -= namelen; memcpy(end, dentry->d_name.name, namelen); *--end = '/'; @@ -68,6 +68,8 @@ char *nfs_path(const char *base, const struct dentry *dentry, end -= namelen; memcpy(end, base, namelen); return end; +Elong_unlock: + spin_unlock(&dcache_lock); Elong: return ERR_PTR(-ENAMETOOLONG); } |