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

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs updates from Al Viro:
 "Assorted stuff; the biggest pile here is Christoph's ACL series.  Plus
  assorted cleanups and fixes all over the place...

  There will be another pile later this week"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (43 commits)
  __dentry_path() fixes
  vfs: Remove second variable named error in __dentry_path
  vfs: Is mounted should be testing mnt_ns for NULL or error.
  Fix race when checking i_size on direct i/o read
  hfsplus: remove can_set_xattr
  nfsd: use get_acl and ->set_acl
  fs: remove generic_acl
  nfs: use generic posix ACL infrastructure for v3 Posix ACLs
  gfs2: use generic posix ACL infrastructure
  jfs: use generic posix ACL infrastructure
  xfs: use generic posix ACL infrastructure
  reiserfs: use generic posix ACL infrastructure
  ocfs2: use generic posix ACL infrastructure
  jffs2: use generic posix ACL infrastructure
  hfsplus: use generic posix ACL infrastructure
  f2fs: use generic posix ACL infrastructure
  ext2/3/4: use generic posix ACL infrastructure
  btrfs: use generic posix ACL infrastructure
  fs: make posix_acl_create more useful
  fs: make posix_acl_chmod more useful
  ...
parents 54c0a4b4 f6500801

arch/blackfin/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#ifdef CONFIG_MTD_UCLINUX

#include <linux/mtd/map.h>

#include <linux/ext2_fs.h>

#include <linux/cramfs_fs.h>

#include <uapi/linux/cramfs_fs.h>

#include <linux/romfs_fs.h>

#endif

arch/cris/arch-v32/drivers/axisflashmap.c

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#include <linux/mtd/mtdram.h>

#include <linux/mtd/partitions.h>



#include <linux/cramfs_fs.h>



#include <asm/axisflashmap.h>

#include <asm/mmu.h>

fs/9p/acl.c

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ int v9fs_acl_chmod(struct inode *inode, struct p9_fid *fid) 
		return -EOPNOTSUPP;

	acl = v9fs_get_cached_acl(inode, ACL_TYPE_ACCESS);

	if (acl) {

		retval = posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);

		retval = __posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);

		if (retval)

			return retval;

		set_cached_acl(inode, ACL_TYPE_ACCESS, acl);
@@ -200,7 +200,7 @@ int v9fs_acl_mode(struct inode *dir, umode_t *modep, 
	if (acl) {

		if (S_ISDIR(mode))

			*dpacl = posix_acl_dup(acl);

		retval = posix_acl_create(&acl, GFP_NOFS, &mode);

		retval = __posix_acl_create(&acl, GFP_NOFS, &mode);

		if (retval < 0)

			return retval;

		if (retval > 0)

fs/Kconfig

+1 −5
Original line number Diff line number Diff line
@@ -68,10 +68,6 @@ source "fs/quota/Kconfig" 
source "fs/autofs4/Kconfig"

source "fs/fuse/Kconfig"



config GENERIC_ACL

	bool

	select FS_POSIX_ACL



menu "Caches"



source "fs/fscache/Kconfig"
@@ -119,7 +115,7 @@ config TMPFS_POSIX_ACL 
	bool "Tmpfs POSIX Access Control Lists"

	depends on TMPFS

	select TMPFS_XATTR

	select GENERIC_ACL

	select FS_POSIX_ACL

	help

	  POSIX Access Control Lists (ACLs) support additional access rights

	  for users and groups beyond the standard owner/group/world scheme,

fs/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -42,9 +42,8 @@ obj-$(CONFIG_BINFMT_SOM) += binfmt_som.o 
obj-$(CONFIG_BINFMT_FLAT)	+= binfmt_flat.o



obj-$(CONFIG_FS_MBCACHE)	+= mbcache.o

obj-$(CONFIG_FS_POSIX_ACL)	+= posix_acl.o xattr_acl.o

obj-$(CONFIG_FS_POSIX_ACL)	+= posix_acl.o

obj-$(CONFIG_NFS_COMMON)	+= nfs_common/

obj-$(CONFIG_GENERIC_ACL)	+= generic_acl.o

obj-$(CONFIG_COREDUMP)		+= coredump.o

obj-$(CONFIG_SYSCTL)		+= drop_caches.o