aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2009-06-24 16:58:48 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2009-06-24 16:58:48 -0400
commit72c04902d1e27c8a324014cff1d4475c11b1cecd (patch)
tree3e93abdd0a3eeedd6df5a1dc43170744f2fa7664 /fs/jffs2
parent641cf4a668e9e69d2bc061e953422ff72a91f86e (diff)
Get "no acls for this inode" right, fix shmem breakage
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/jffs2')
-rw-r--r--fs/jffs2/acl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index edd2ad6416d..8fcb6239218 100644
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -284,8 +284,7 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode)
284 struct posix_acl *acl, *clone; 284 struct posix_acl *acl, *clone;
285 int rc; 285 int rc;
286 286
287 inode->i_default_acl = NULL; 287 cache_no_acl(inode);
288 inode->i_acl = NULL;
289 288
290 if (S_ISLNK(*i_mode)) 289 if (S_ISLNK(*i_mode))
291 return 0; /* Symlink always has no-ACL */ 290 return 0; /* Symlink always has no-ACL */