From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sat, 20 Aug 2005 18:38:06 +0000 (+0000)
Subject: - sync vserver branch:  will help future merges
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~151
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=49f062c93510e60cba7fd6c1f6e6dadbd37bd706;p=linux-2.6.git

- sync vserver branch:  will help future merges
- remove redundant barrier check
---

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.