Commit 0003230e 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-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  fs: take the ACL checks to common code
  bury posix_acl_..._masq() variants
  kill boilerplates around posix_acl_create_masq()
  generic_acl: no need to clone acl just to push it to set_cached_acl()
  kill boilerplate around posix_acl_chmod_masq()
  reiserfs: cache negative ACLs for v1 stat format
  xfs: cache negative ACLs if there is no attribute fork
  9p: do no return 0 from ->check_acl without actually checking
  vfs: move ACL cache lookup into generic code
  CIFS: Fix oops while mounting with prefixpath
  xfs: Fix wrong return value of xfs_file_aio_write
  fix devtmpfs race
  caam: don't pass bogus S_IFCHR to debugfs_create_...()
  get rid of create_proc_entry() abuses - proc_mkdir() is there for purpose
  asus-wmi: ->is_visible() can't return negative
  fix jffs2 ACLs on big-endian with 16bit mode_t
  9p: close ACL leaks
  ocfs2_init_acl(): fix a leak
  VFS : mount lock scalability for internal mounts
parents 4b478ced 4e34e719

Documentation/filesystems/Locking

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ ata *); 
	void (*put_link) (struct dentry *, struct nameidata *, void *);

	void (*truncate) (struct inode *);

	int (*permission) (struct inode *, int, unsigned int);

	int (*check_acl)(struct inode *, int);

	int (*get_acl)(struct inode *, int);

	int (*setattr) (struct dentry *, struct iattr *);

	int (*getattr) (struct vfsmount *, struct dentry *, struct kstat *);

	int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
@@ -80,7 +80,7 @@ put_link: no 
truncate:	yes		(see below)

setattr:	yes

permission:	no (may not block if called in rcu-walk mode)

check_acl:	no

get_acl:	no

getattr:	no

setxattr:	yes

getxattr:	no

Documentation/filesystems/porting

+4 −3
Original line number Diff line number Diff line
@@ -407,10 +407,11 @@ to some pointer to returning that pointer. On errors return ERR_PTR(...). 


--

[mandatory]

	->permission(), generic_permission() and ->check_acl() have lost flags

	->permission() and generic_permission()have lost flags

argument; instead of passing IPERM_FLAG_RCU we add MAY_NOT_BLOCK into mask.

	generic_permission() has also lost the check_acl argument; if you want

non-NULL to be used for that inode, put it into ->i_op->check_acl.

	generic_permission() has also lost the check_acl argument; ACL checking

has been taken to VFS and filesystems need to provide a non-NULL ->i_op->get_acl

to read an ACL from disk.



--

[mandatory]

Documentation/filesystems/vfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ struct inode_operations { 
        void (*put_link) (struct dentry *, struct nameidata *, void *);

	void (*truncate) (struct inode *);

	int (*permission) (struct inode *, int);

	int (*check_acl)(struct inode *, int);

	int (*get_acl)(struct inode *, int);

	int (*setattr) (struct dentry *, struct iattr *);

	int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);

	int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);

arch/arm/mach-bcmring/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ int dma_init(void) 


	/* Create /proc/dma/channels and /proc/dma/devices */



	gDmaDir = create_proc_entry("dma", S_IFDIR | S_IRUGO | S_IXUGO, NULL);

	gDmaDir = proc_mkdir("dma", NULL);



	if (gDmaDir == NULL) {

		printk(KERN_ERR "Unable to create /proc/dma\n");

drivers/base/devtmpfs.c

+2 −1
Original line number Diff line number Diff line
@@ -406,9 +406,10 @@ static int devtmpfsd(void *p) 
			requests = NULL;

			spin_unlock(&req_lock);

			while (req) {

				struct req *next = req->next;

				req->err = handle(req->name, req->mode, req->dev);

				complete(&req->done);

				req = req->next;

				req = next;

			}

			spin_lock(&req_lock);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE