git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
fs
/
ext2
/
acl.c
diff --git
a/fs/ext2/acl.c
b/fs/ext2/acl.c
index
d232026
..
091a317
100644
(file)
--- a/
fs/ext2/acl.c
+++ b/
fs/ext2/acl.c
@@
-8,8
+8,6
@@
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/fs.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/fs.h>
-#include <linux/namei.h>
-#include <linux/vs_base.h>
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
@@
-163,7
+161,7
@@
ext2_get_acl(struct inode *inode, int type)
int retval;
if (!test_opt(inode->i_sb, POSIX_ACL))
int retval;
if (!test_opt(inode->i_sb, POSIX_ACL))
- return
NULL
;
+ return
0
;
switch(type) {
case ACL_TYPE_ACCESS:
switch(type) {
case ACL_TYPE_ACCESS:
@@
-292,12
+290,8
@@
ext2_permission(struct inode *inode, int mask, struct nameidata *nd)
{
int mode = inode->i_mode;
{
int mode = inode->i_mode;
- /* Prevent vservers from escaping chroot() barriers */
- if (IS_BARRIER(inode) && !vx_check(0, VX_ADMIN))
- return -EACCES;
/* Nobody gets write access to a read-only fs */
/* Nobody gets write access to a read-only fs */
- if ((mask & MAY_WRITE) && (IS_RDONLY(inode) ||
- (nd && MNT_IS_RDONLY(nd->mnt))) &&
+ if ((mask & MAY_WRITE) && IS_RDONLY(inode) &&
(S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)))
return -EROFS;
/* Nobody gets write access to an immutable file */
(S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)))
return -EROFS;
/* Nobody gets write access to an immutable file */