From 49f062c93510e60cba7fd6c1f6e6dadbd37bd706 Mon Sep 17 00:00:00 2001
From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sat, 20 Aug 2005 18:38:06 +0000
Subject: [PATCH] - sync vserver branch: will help future merges - remove
redundant barrier check
---
fs/reiserfs/xattr.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
index 23900da48..0dffc5b0c 100644
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -831,7 +831,7 @@ reiserfs_delete_xattrs (struct inode *inode)
if (dir->d_inode->i_nlink <= 2) {
root = get_xa_root (inode->i_sb);
reiserfs_write_lock_xattrs (inode->i_sb);
- err = vfs_rmdir (root->d_inode, dir);
+ err = vfs_rmdir (root->d_inode, dir, NULL);
reiserfs_write_unlock_xattrs (inode->i_sb);
dput (root);
} else {
@@ -1348,10 +1348,6 @@ __reiserfs_permission (struct inode *inode, int mask, struct nameidata *nd,
{
umode_t mode = inode->i_mode;
- /* Prevent vservers from escaping chroot() barriers */
- if (IS_BARRIER(inode) && !vx_check(0, VX_ADMIN))
- return -EACCES;
-
if (mask & MAY_WRITE) {
/*
* Nobody gets write access to a read-only fs.
--
2.47.0