--- fs/reiserfs/xattr.c

+++ fs/reiserfs/xattr.c

@@ -536,7 +536,7 @@ reiserfs_xattr_set_handle(struct reiserf

if (!err && new_size < i_size_read(dentry->d_inode)) {

struct iattr newattrs = {

.ia_ctime = current_fs_time(inode->i_sb),

- .ia_size = buffer_size,

+ .ia_size = new_size,

.ia_valid = ATTR_SIZE | ATTR_CTIME,

};

mutex_lock_nested(&dentry->d_inode->i_mutex, I_MUTEX_XATTR);

@@ -952,21 +952,13 @@ int reiserfs_permission(struct inode *in

return generic_permission(inode, mask, NULL);

}

-/* This will catch lookups from the fs root to .reiserfs_priv */

-static int

-xattr_lookup_poison(struct dentry *dentry, struct qstr *q1, struct qstr *name)

-{

- struct dentry *priv_root = REISERFS_SB(dentry->d_sb)->priv_root;

- if (container_of(q1, struct dentry, d_name) == priv_root)

- return -ENOENT;

- if (q1->len == name->len &&

- !memcmp(q1->name, name->name, name->len))

- return 0;

- return 1;

+static int xattr_hide_revalidate(struct dentry *dentry, struct nameidata *nd)

+{

+ return -EPERM;

}

static const struct dentry_operations xattr_lookup_poison_ops = {

- .d_compare = xattr_lookup_poison,

+ .d_revalidate = xattr_hide_revalidate,

};

int reiserfs_lookup_privroot(struct super_block *s)

@@ -980,8 +972,7 @@ int reiserfs_lookup_privroot(struct supe

strlen(PRIVROOT_NAME));

if (!IS_ERR(dentry)) {

REISERFS_SB(s)->priv_root = dentry;

- if (!reiserfs_expose_privroot(s))

- s->s_root->d_op = &xattr_lookup_poison_ops;

+ dentry->d_op = &xattr_lookup_poison_ops;

if (dentry->d_inode)

dentry->d_inode->i_flags |= S_PRIVATE;

} else