diff options
author | Jeff Mahoney <jeffm@suse.com> | 2009-05-05 15:30:17 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-05-09 10:49:39 -0400 |
commit | 677c9b2e393a0cd203bd54e9c18b012b2c73305a (patch) | |
tree | 575d3f70bb9fbf12171ff526909b68377bede67b /fs/reiserfs/namei.c | |
parent | b82bb72ba7df473461c5e2368a4e7497c8ce76e9 (diff) |
reiserfs: remove privroot hiding in lookup
With Al Viro's patch to move privroot lookup to fs mount, there's no need
to have special code to hide the privroot in reiserfs_lookup.
I've also cleaned up the privroot hiding in reiserfs_readdir_dentry and
removed the last user of reiserfs_xattrs().
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
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); |