diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-30 09:56:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-30 09:56:44 +0200 |
| commit | 3ca50496c2677a2b3fdd3ede86660fd1433beac6 (patch) | |
| tree | 97a76d8479a8d8a96e04ed0694b8dbf89457bfcc /fs/reiserfs/dir.c | |
| parent | 462b04e28a7ec1339c892117c3f20a40e55d0e83 (diff) | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
| download | linux-3ca50496c2677a2b3fdd3ede86660fd1433beac6.tar.bz2 | |
Merge commit 'v2.6.34-rc6' into perf/core
Merge reason: update to the latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/reiserfs/dir.c')
| -rw-r--r-- | fs/reiserfs/dir.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c index f8a6075abf50..07930449a958 100644 --- 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); } |