Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72c04902 authored by Al Viro's avatar Al Viro
Browse files

Get "no acls for this inode" right, fix shmem breakage 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 641cf4a6

fs/btrfs/inode.c

+2 −4
Original line number Diff line number Diff line
@@ -2122,10 +2122,8 @@ static void btrfs_read_locked_inode(struct inode *inode) 
	 * any xattrs or acls

	 */

	maybe_acls = acls_after_inode_item(leaf, path->slots[0], inode->i_ino);

	if (!maybe_acls) {

		inode->i_acl = NULL;

		inode->i_default_acl = NULL;

	}

	if (!maybe_acls)

		cache_no_acl(inode);



	BTRFS_I(inode)->block_group = btrfs_find_block_group(root, 0,

						alloc_group_block, 0);

fs/jffs2/acl.c

+1 −2
Original line number Diff line number Diff line
@@ -284,8 +284,7 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode) 
	struct posix_acl *acl, *clone;

	int rc;



	inode->i_default_acl = NULL;

	inode->i_acl = NULL;

	cache_no_acl(inode);



	if (S_ISLNK(*i_mode))

		return 0;	/* Symlink always has no-ACL */

include/linux/posix_acl.h

+9 −0
Original line number Diff line number Diff line
@@ -148,4 +148,13 @@ static inline void forget_cached_acl(struct inode *inode, int type) 
		posix_acl_release(old);

}

#endif



static inline void cache_no_acl(struct inode *inode)

{

#ifdef CONFIG_FS_POSIX_ACL

	inode->i_acl = NULL;

	inode->i_default_acl = NULL;

#endif

}



#endif  /* __LINUX_POSIX_ACL_H */

mm/shmem.c

+1 −4
Original line number Diff line number Diff line
@@ -1558,6 +1558,7 @@ static struct inode *shmem_get_inode(struct super_block *sb, int mode, 
		spin_lock_init(&info->lock);

		info->flags = flags & VM_NORESERVE;

		INIT_LIST_HEAD(&info->swaplist);

		cache_no_acl(inode);



		switch (mode & S_IFMT) {

		default:
@@ -2379,10 +2380,6 @@ static struct inode *shmem_alloc_inode(struct super_block *sb) 
	p = (struct shmem_inode_info *)kmem_cache_alloc(shmem_inode_cachep, GFP_KERNEL);

	if (!p)

		return NULL;

#ifdef CONFIG_TMPFS_POSIX_ACL

	p->vfs_inode.i_acl = NULL;

	p->vfs_inode.i_default_acl = NULL;

#endif

	return &p->vfs_inode;

}