diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-08 11:31:22 +0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-08 11:31:22 +0400 |
commit | d95300758bed9e0f783f3e3b4fd037bf0a21abe0 (patch) | |
tree | 994823b6e0b88597eded79f9eeb0f44b580c89e5 /fs/namei.c | |
parent | e12669e774be403c84baa651306d305752a35cd8 (diff) | |
parent | 829841146878e082613a49581ae252c071057c23 (diff) | |
download | linux-d95300758bed9e0f783f3e3b4fd037bf0a21abe0.tar.xz |
Merge branch 'master'
Diffstat (limited to 'fs/namei.c')
-rw-r--r-- | fs/namei.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/namei.c b/fs/namei.c index 043d587216b5..aa62dbda93ac 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1551,19 +1551,19 @@ do_link: if (nd->last_type != LAST_NORM) goto exit; if (nd->last.name[nd->last.len]) { - putname(nd->last.name); + __putname(nd->last.name); goto exit; } error = -ELOOP; if (count++==32) { - putname(nd->last.name); + __putname(nd->last.name); goto exit; } dir = nd->dentry; down(&dir->d_inode->i_sem); path.dentry = __lookup_hash(&nd->last, nd->dentry, nd); path.mnt = nd->mnt; - putname(nd->last.name); + __putname(nd->last.name); goto do_last; } |