diff options
Diffstat (limited to 'fs/ext3/namei.c')
-rw-r--r-- | fs/ext3/namei.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index b3c690a3b54a..8bd8ac077704 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c | |||
@@ -1005,10 +1005,7 @@ static struct dentry *ext3_lookup(struct inode * dir, struct dentry *dentry, str | |||
1005 | if (!inode) | 1005 | if (!inode) |
1006 | return ERR_PTR(-EACCES); | 1006 | return ERR_PTR(-EACCES); |
1007 | } | 1007 | } |
1008 | if (inode) | 1008 | return d_splice_alias(inode, dentry); |
1009 | return d_splice_alias(inode, dentry); | ||
1010 | d_add(dentry, inode); | ||
1011 | return NULL; | ||
1012 | } | 1009 | } |
1013 | 1010 | ||
1014 | 1011 | ||
@@ -1476,7 +1473,7 @@ static int ext3_dx_add_entry(handle_t *handle, struct dentry *dentry, | |||
1476 | if (levels && (dx_get_count(frames->entries) == | 1473 | if (levels && (dx_get_count(frames->entries) == |
1477 | dx_get_limit(frames->entries))) { | 1474 | dx_get_limit(frames->entries))) { |
1478 | ext3_warning(sb, __FUNCTION__, | 1475 | ext3_warning(sb, __FUNCTION__, |
1479 | "Directory index full!\n"); | 1476 | "Directory index full!"); |
1480 | err = -ENOSPC; | 1477 | err = -ENOSPC; |
1481 | goto cleanup; | 1478 | goto cleanup; |
1482 | } | 1479 | } |