aboutsummaryrefslogtreecommitdiff
path: root/fs/affs/namei.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-06-01 19:05:23 +1000
committerPaul Mackerras <paulus@samba.org>2006-06-01 19:05:23 +1000
commitc029cc66cb3d83f70c02e0c182f0eed1419f8020 (patch)
treeb9ed887a0e6434fedebcbf90b3d2ba1aeff68a01 /fs/affs/namei.c
parent0a9cb46a73abd6c45e7c986bec984eed60c417b6 (diff)
parentba8f5baba79da8eb502f8534c3a8ecb64aceb790 (diff)
Merge branch 'merge'
Diffstat (limited to 'fs/affs/namei.c')
-rw-r--r--fs/affs/namei.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index d4c2d636c47..a42143ca016 100644
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -416,10 +416,9 @@ affs_rename(struct inode *old_dir, struct dentry *old_dentry,
return retval;
}
- retval = -EIO;
bh = affs_bread(sb, old_dentry->d_inode->i_ino);
if (!bh)
- goto done;
+ return -EIO;
/* Remove header from its parent directory. */
affs_lock_dir(old_dir);