summaryrefslogtreecommitdiffstats
path: root/fs/reiserfs/xattr.c
diff options
context:
space:
mode:
authorJeff Mahoney2009-05-10 22:05:39 +0200
committerAl Viro2009-06-12 03:35:58 +0200
commit73422811d290c628b4ddbf6830e5cd6fa42e84f1 (patch)
tree9308c36ee82a8217b02848372896209335c69575 /fs/reiserfs/xattr.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff)
downloadkernel-qcow2-linux-73422811d290c628b4ddbf6830e5cd6fa42e84f1.tar.gz
kernel-qcow2-linux-73422811d290c628b4ddbf6830e5cd6fa42e84f1.tar.xz
kernel-qcow2-linux-73422811d290c628b4ddbf6830e5cd6fa42e84f1.zip
reiserfs: allow exposing privroot w/ xattrs enabled
This patch adds an -oexpose_privroot option to allow access to the privroot. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/reiserfs/xattr.c')
-rw-r--r--fs/reiserfs/xattr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
index 8e7deb0e6964..f3d47d856848 100644
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -981,7 +981,8 @@ int reiserfs_lookup_privroot(struct super_block *s)
strlen(PRIVROOT_NAME));
if (!IS_ERR(dentry)) {
REISERFS_SB(s)->priv_root = dentry;
- s->s_root->d_op = &xattr_lookup_poison_ops;
+ if (!reiserfs_expose_privroot(s))
+ s->s_root->d_op = &xattr_lookup_poison_ops;
if (dentry->d_inode)
dentry->d_inode->i_flags |= S_PRIVATE;
} else