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

Commit 5ed487bc 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: (46 commits)
  [PATCH] fs: add a sanity check in d_free
  [PATCH] i_version: remount support
  [patch] vfs: make security_inode_setattr() calling consistent
  [patch 1/3] FS_MBCACHE: don't needlessly make it built-in
  [PATCH] move executable checking into ->permission()
  [PATCH] fs/dcache.c: update comment of d_validate()
  [RFC PATCH] touch_mnt_namespace when the mount flags change
  [PATCH] reiserfs: add missing llseek method
  [PATCH] fix ->llseek for more directories
  [PATCH vfs-2.6 6/6] vfs: add LOOKUP_RENAME_TARGET intent
  [PATCH vfs-2.6 5/6] vfs: remove LOOKUP_PARENT from non LOOKUP_PARENT lookup
  [PATCH vfs-2.6 4/6] vfs: remove unnecessary fsnotify_d_instantiate()
  [PATCH vfs-2.6 3/6] vfs: add __d_instantiate() helper
  [PATCH vfs-2.6 2/6] vfs: add d_ancestor()
  [PATCH vfs-2.6 1/6] vfs: replace parent == dentry->d_parent by IS_ROOT()
  [PATCH] get rid of on-stack dentry in udf
  [PATCH 2/2] anondev: switch to IDA
  [PATCH 1/2] anondev: init IDR statically
  [JFFS2] Use d_splice_alias() not d_add() in jffs2_lookup()
  [PATCH] Optimise NFS readdir hack slightly.
  ...
parents 5b346539 fd217f4d

arch/alpha/kernel/osf_sys.c

+2 −5
Original line number Diff line number Diff line
@@ -165,14 +165,11 @@ osf_getdirentries(unsigned int fd, struct osf_dirent __user *dirent, 
	buf.error = 0;



	error = vfs_readdir(file, osf_filldir, &buf);

	if (error < 0)

		goto out_putf;



	if (error >= 0)

		error = buf.error;

	if (count != buf.count)

		error = count - buf.count;



 out_putf:

	fput(file);

 out:

	return error;

arch/parisc/hpux/fs.c

+2 −3
Original line number Diff line number Diff line
@@ -127,8 +127,7 @@ int hpux_getdents(unsigned int fd, struct hpux_dirent __user *dirent, unsigned i 
	buf.error = 0;



	error = vfs_readdir(file, filldir, &buf);

	if (error < 0)

		goto out_putf;

	if (error >= 0)

		error = buf.error;

	lastdirent = buf.previous;

	if (lastdirent) {

arch/powerpc/platforms/cell/spufs/syscalls.c

+2 −2
Original line number Diff line number Diff line
@@ -69,9 +69,9 @@ static long do_spu_create(const char __user *pathname, unsigned int flags, 
	if (!IS_ERR(tmp)) {

		struct nameidata nd;



		ret = path_lookup(tmp, LOOKUP_PARENT|

				LOOKUP_OPEN|LOOKUP_CREATE, &nd);

		ret = path_lookup(tmp, LOOKUP_PARENT, &nd);

		if (!ret) {

			nd.flags |= LOOKUP_OPEN | LOOKUP_CREATE;

			ret = spufs_create(&nd, flags, mode, neighbor);

			path_put(&nd.path);

		}

drivers/md/dm-table.c

+6 −15
Original line number Diff line number Diff line
@@ -312,19 +312,6 @@ static inline int check_space(struct dm_table *t) 
	return 0;

}



/*

 * Convert a device path to a dev_t.

 */

static int lookup_device(const char *path, dev_t *dev)

{

	struct block_device *bdev = lookup_bdev(path);

	if (IS_ERR(bdev))

		return PTR_ERR(bdev);

	*dev = bdev->bd_dev;

	bdput(bdev);

	return 0;

}



/*

 * See if we've already got a device in the list.

 */
@@ -437,8 +424,12 @@ static int __table_get_device(struct dm_table *t, struct dm_target *ti, 
			return -EOVERFLOW;

	} else {

		/* convert the path to a device */

		if ((r = lookup_device(path, &dev)))

			return r;

		struct block_device *bdev = lookup_bdev(path);



		if (IS_ERR(bdev))

			return PTR_ERR(bdev);

		dev = bdev->bd_dev;

		bdput(bdev);

	}



	dd = find_device(&t->devices, dev);

fs/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -22,9 +22,10 @@ source "fs/jbd2/Kconfig" 
config FS_MBCACHE

# Meta block cache for Extended Attributes (ext2/ext3/ext4)

	tristate

	depends on EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4_FS_XATTR

	default y if EXT2_FS=y || EXT3_FS=y || EXT4_FS=y

	default m if EXT2_FS=m || EXT3_FS=m || EXT4_FS=m

	default y if EXT2_FS=y && EXT2_FS_XATTR

	default y if EXT3_FS=y && EXT3_FS_XATTR

	default y if EXT4_FS=y && EXT4_FS_XATTR

	default m if EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4_FS_XATTR



config REISERFS_FS

	tristate "Reiserfs support"