diff options
Diffstat (limited to 'fs/reiserfs/namei.c')
| -rw-r--r-- | fs/reiserfs/namei.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c index efd4d720718e..271579128634 100644 --- a/fs/reiserfs/namei.c +++ b/fs/reiserfs/namei.c | |||
| @@ -338,21 +338,8 @@ static struct dentry *reiserfs_lookup(struct inode *dir, struct dentry *dentry, | |||
| 338 | &path_to_entry, &de); | 338 | &path_to_entry, &de); |
| 339 | pathrelse(&path_to_entry); | 339 | pathrelse(&path_to_entry); |
| 340 | if (retval == NAME_FOUND) { | 340 | if (retval == NAME_FOUND) { |
| 341 | /* Hide the .reiserfs_priv directory */ | 341 | inode = reiserfs_iget(dir->i_sb, |
| 342 | if (reiserfs_xattrs(dir->i_sb) && | 342 | (struct cpu_key *)&(de.de_dir_id)); |
| 343 | !old_format_only(dir->i_sb) && | ||
| 344 | REISERFS_SB(dir->i_sb)->priv_root && | ||
| 345 | REISERFS_SB(dir->i_sb)->priv_root->d_inode && | ||
| 346 | de.de_objectid == | ||
| 347 | le32_to_cpu(INODE_PKEY | ||
| 348 | (REISERFS_SB(dir->i_sb)->priv_root->d_inode)-> | ||
| 349 | k_objectid)) { | ||
| 350 | reiserfs_write_unlock(dir->i_sb); | ||
| 351 | return ERR_PTR(-EACCES); | ||
| 352 | } | ||
| 353 | |||
| 354 | inode = | ||
| 355 | reiserfs_iget(dir->i_sb, (struct cpu_key *)&(de.de_dir_id)); | ||
| 356 | if (!inode || IS_ERR(inode)) { | 343 | if (!inode || IS_ERR(inode)) { |
| 357 | reiserfs_write_unlock(dir->i_sb); | 344 | reiserfs_write_unlock(dir->i_sb); |
| 358 | return ERR_PTR(-EACCES); | 345 | return ERR_PTR(-EACCES); |
