Merge branch 'iommu/largepages' into amd-iommu/2.6.35

[mv-sheeva.git] / fs / reiserfs / dir.c

diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c
index f8a6075abf50c6bd83f245b1532b4c5352370a77..07930449a9583ebee29e5781c3e4dbf9f609aa6f 100644 (file)
--- a/fs/reiserfs/dir.c
+++ b/fs/reiserfs/dir.c
@@ -46,8 +46,6 @@ static inline bool is_privroot_deh(struct dentry *dir,
                                   struct reiserfs_de_head *deh)
 {
        struct dentry *privroot = REISERFS_SB(dir->d_sb)->priv_root;
-       if (reiserfs_expose_privroot(dir->d_sb))
-               return 0;
        return (dir == dir->d_parent && privroot->d_inode &&
                deh->deh_objectid == INODE_PKEY(privroot->d_inode)->k_objectid);
 }