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

Commit 1b8e9499 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:
  xfs: Fix build breakage in xfs_iops.c when CONFIG_FS_POSIX_ACL is not set
  VFS: Reorganise shrink_dcache_for_umount_subtree() after demise of dcache_lock
  VFS: Remove dentry->d_lock locking from shrink_dcache_for_umount_subtree()
  VFS: Remove detached-dentry counter from shrink_dcache_for_umount_subtree()
  switch posix_acl_chmod() to umode_t
  switch posix_acl_from_mode() to umode_t
  switch posix_acl_equiv_mode() to umode_t *
  switch posix_acl_create() to umode_t *
  block: initialise bd_super in bdget()
  vfs: avoid call to inode_lru_list_del() if possible
  vfs: avoid taking inode_hash_lock on pipes and sockets
  vfs: conditionally call inode_wb_list_del()
  VFS: Fix automount for negative autofs dentries
  Btrfs: load the key from the dir item in readdir into a fake dentry
  devtmpfs: missing initialialization in never-hit case
  hppfs: missing include
parents 12ff47e7 206d440f

drivers/base/devtmpfs.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static int create_path(const char *nodepath) 
{

	char *path;

	char *s;

	int err;

	int err = 0;



	/* parent directories do not exist, create them */

	path = kstrdup(nodepath, GFP_KERNEL);

fs/9p/acl.c

+3 −3
Original line number Diff line number Diff line
@@ -182,11 +182,11 @@ int v9fs_set_create_acl(struct dentry *dentry, 
	return 0;

}



int v9fs_acl_mode(struct inode *dir, mode_t *modep,

int v9fs_acl_mode(struct inode *dir, umode_t *modep,

		  struct posix_acl **dpacl, struct posix_acl **pacl)

{

	int retval = 0;

	mode_t mode = *modep;

	umode_t mode = *modep;

	struct posix_acl *acl = NULL;



	if (!S_ISLNK(mode)) {
@@ -319,7 +319,7 @@ static int v9fs_xattr_set_acl(struct dentry *dentry, const char *name, 
	case ACL_TYPE_ACCESS:

		name = POSIX_ACL_XATTR_ACCESS;

		if (acl) {

			mode_t mode = inode->i_mode;

			umode_t mode = inode->i_mode;

			retval = posix_acl_equiv_mode(acl, &mode);

			if (retval < 0)

				goto err_out;

fs/9p/acl.h

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ extern struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type); 
extern int v9fs_acl_chmod(struct dentry *);

extern int v9fs_set_create_acl(struct dentry *,

			       struct posix_acl **, struct posix_acl **);

extern int v9fs_acl_mode(struct inode *dir, mode_t *modep,

extern int v9fs_acl_mode(struct inode *dir, umode_t *modep,

			 struct posix_acl **dpacl, struct posix_acl **pacl);

#else

#define v9fs_iop_get_acl NULL
@@ -38,7 +38,7 @@ static inline int v9fs_set_create_acl(struct dentry *dentry, 
{

	return 0;

}

static inline int v9fs_acl_mode(struct inode *dir, mode_t *modep,

static inline int v9fs_acl_mode(struct inode *dir, umode_t *modep,

				struct posix_acl **dpacl,

				struct posix_acl **pacl)

{

fs/9p/vfs_inode_dotl.c

+3 −3
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ v9fs_vfs_create_dotl(struct inode *dir, struct dentry *dentry, int omode, 
	int err = 0;

	gid_t gid;

	int flags;

	mode_t mode;

	umode_t mode;

	char *name = NULL;

	struct file *filp;

	struct p9_qid qid;
@@ -348,7 +348,7 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir, 
	struct p9_fid *fid = NULL, *dfid = NULL;

	gid_t gid;

	char *name;

	mode_t mode;

	umode_t mode;

	struct inode *inode;

	struct p9_qid qid;

	struct dentry *dir_dentry;
@@ -751,7 +751,7 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, int omode, 
	int err;

	gid_t gid;

	char *name;

	mode_t mode;

	umode_t mode;

	struct v9fs_session_info *v9ses;

	struct p9_fid *fid = NULL, *dfid = NULL;

	struct inode *inode;

fs/block_dev.c

+1 −0
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@ struct block_device *bdget(dev_t dev) 


	if (inode->i_state & I_NEW) {

		bdev->bd_contains = NULL;

		bdev->bd_super = NULL;

		bdev->bd_inode = inode;

		bdev->bd_block_size = (1 << inode->i_blkbits);

		bdev->bd_part_count = 0;