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

Commit c6223048 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'for-linus' of... 

Merge branches 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/{vfs-2.6,audit-current}

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  another race fix in jfs_check_acl()
  Get "no acls for this inode" right, fix shmem breakage
  inline functions left without protection of ifdef (acl)

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  audit: inode watches depend on CONFIG_AUDIT not CONFIG_AUDIT_SYSCALL
parents bd453cd4 d5bb68ad 3a6a6c16

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 */

fs/jfs/acl.c

+7 −6
Original line number Diff line number Diff line
@@ -118,15 +118,16 @@ out: 


static int jfs_check_acl(struct inode *inode, int mask)

{

	if (inode->i_acl == ACL_NOT_CACHED) {

	struct posix_acl *acl = jfs_get_acl(inode, ACL_TYPE_ACCESS);



	if (IS_ERR(acl))

		return PTR_ERR(acl);

	if (acl) {

		int error = posix_acl_permission(inode, acl, mask);

		posix_acl_release(acl);

		return error;

	}



	if (inode->i_acl)

		return posix_acl_permission(inode, inode->i_acl, mask);

	return -EAGAIN;

}

include/linux/posix_acl.h

+10 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ extern int posix_acl_chmod_masq(struct posix_acl *, mode_t); 
extern struct posix_acl *get_posix_acl(struct inode *, int);

extern int set_posix_acl(struct inode *, int, struct posix_acl *);



#ifdef CONFIG_FS_POSIX_ACL

static inline struct posix_acl *get_cached_acl(struct inode *inode, int type)

{

	struct posix_acl **p, *acl;
@@ -146,5 +147,14 @@ static inline void forget_cached_acl(struct inode *inode, int type) 
	if (old != ACL_NOT_CACHED)

		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 */

kernel/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ obj-$(CONFIG_IKCONFIG) += configs.o 
obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o

obj-$(CONFIG_STOP_MACHINE) += stop_machine.o

obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o

obj-$(CONFIG_AUDIT) += audit.o auditfilter.o

obj-$(CONFIG_AUDITSYSCALL) += auditsc.o audit_watch.o

obj-$(CONFIG_AUDIT) += audit.o auditfilter.o audit_watch.o

obj-$(CONFIG_AUDITSYSCALL) += auditsc.o

obj-$(CONFIG_GCOV_KERNEL) += gcov/

obj-$(CONFIG_AUDIT_TREE) += audit_tree.o

obj-$(CONFIG_KPROBES) += kprobes.o