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

Commit 8bb1f229 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 second try at vfs part d#2 from Al Viro:
 "Miklos' first series (with do_lookup() rewrite split into edible
  chunks) + assorted bits and pieces.

  The 'untangling of do_lookup()' series is is a splitup of what used to
  be a monolithic patch from Miklos, so this series is basically "how do
  I convince myself that his patch is correct (or find a hole in it)".
  No holes found and I like the resulting cleanup, so in it went..."

Changes from try 1: Fix a boot problem with selinux, and commit messages
prettied up a bit.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (24 commits)
  vfs: fix out-of-date dentry_unhash() comment
  vfs: split __lookup_hash
  untangling do_lookup() - take __lookup_hash()-calling case out of line.
  untangling do_lookup() - switch to calling __lookup_hash()
  untangling do_lookup() - merge d_alloc_and_lookup() callers
  untangling do_lookup() - merge failure exits in !dentry case
  untangling do_lookup() - massage !dentry case towards __lookup_hash()
  untangling do_lookup() - get rid of need_reval in !dentry case
  untangling do_lookup() - eliminate a loop.
  untangling do_lookup() - expand the area under ->i_mutex
  untangling do_lookup() - isolate !dentry stuff from the rest of it.
  vfs: move MAY_EXEC check from __lookup_hash()
  vfs: don't revalidate just looked up dentry
  vfs: fix d_need_lookup/d_revalidate order in do_lookup
  ext3: move headers to fs/ext3/
  migrate ext2_fs.h guts to fs/ext2/ext2.h
  new helper: ext2_image_size()
  get rid of pointless includes of ext2_fs.h
  ext2: No longer export ext2_fs.h to user space
  mtdchar: kill persistently held vfsmount
  ...
parents f22e08a7 c0d02594

arch/blackfin/kernel/setup.c

+4 −3
Original line number Diff line number Diff line
@@ -550,6 +550,7 @@ static __init void memory_setup(void) 
{

#ifdef CONFIG_MTD_UCLINUX

	unsigned long mtd_phys = 0;

	unsigned long n;

#endif

	unsigned long max_mem;
@@ -593,9 +594,9 @@ static __init void memory_setup(void) 
	mtd_size = PAGE_ALIGN(*((unsigned long *)(mtd_phys + 8)));



# if defined(CONFIG_EXT2_FS) || defined(CONFIG_EXT3_FS)

	if (*((unsigned short *)(mtd_phys + 0x438)) == EXT2_SUPER_MAGIC)

		mtd_size =

		    PAGE_ALIGN(*((unsigned long *)(mtd_phys + 0x404)) << 10);

	n = ext2_image_size((void *)(mtd_phys + 0x400));

	if (n)

		mtd_size = PAGE_ALIGN(n * 1024);

# endif



# if defined(CONFIG_CRAMFS)

drivers/mtd/mtdchar.c

+16 −37
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include <asm/uaccess.h>



static DEFINE_MUTEX(mtd_mutex);

static struct vfsmount *mtd_inode_mnt __read_mostly;



/*

 * Data structure to hold the pointer to the mtd device as well
@@ -75,7 +74,9 @@ static loff_t mtdchar_lseek(struct file *file, loff_t offset, int orig) 
	return -EINVAL;

}





static int count;

static struct vfsmount *mnt;

static struct file_system_type mtd_inodefs_type;



static int mtdchar_open(struct inode *inode, struct file *file)

{
@@ -92,6 +93,10 @@ static int mtdchar_open(struct inode *inode, struct file *file) 
	if ((file->f_mode & FMODE_WRITE) && (minor & 1))

		return -EACCES;



	ret = simple_pin_fs(&mtd_inodefs_type, &mnt, &count);

	if (ret)

		return ret;



	mutex_lock(&mtd_mutex);

	mtd = get_mtd_device(NULL, devnum);
@@ -106,7 +111,7 @@ static int mtdchar_open(struct inode *inode, struct file *file) 
		goto out;

	}



	mtd_ino = iget_locked(mtd_inode_mnt->mnt_sb, devnum);

	mtd_ino = iget_locked(mnt->mnt_sb, devnum);

	if (!mtd_ino) {

		put_mtd_device(mtd);

		ret = -ENOMEM;
@@ -141,6 +146,7 @@ static int mtdchar_open(struct inode *inode, struct file *file) 


out:

	mutex_unlock(&mtd_mutex);

	simple_release_fs(&mnt, &count);

	return ret;

} /* mtdchar_open */
@@ -162,6 +168,7 @@ static int mtdchar_close(struct inode *inode, struct file *file) 
	put_mtd_device(mtd);

	file->private_data = NULL;

	kfree(mfi);

	simple_release_fs(&mnt, &count);



	return 0;

} /* mtdchar_close */
@@ -1175,10 +1182,15 @@ static const struct file_operations mtd_fops = { 
#endif

};



static const struct super_operations mtd_ops = {

	.drop_inode = generic_delete_inode,

	.statfs = simple_statfs,

};



static struct dentry *mtd_inodefs_mount(struct file_system_type *fs_type,

				int flags, const char *dev_name, void *data)

{

	return mount_pseudo(fs_type, "mtd_inode:", NULL, NULL, MTD_INODE_FS_MAGIC);

	return mount_pseudo(fs_type, "mtd_inode:", &mtd_ops, NULL, MTD_INODE_FS_MAGIC);

}



static struct file_system_type mtd_inodefs_type = {
@@ -1187,26 +1199,6 @@ static struct file_system_type mtd_inodefs_type = { 
       .kill_sb = kill_anon_super,

};



static void mtdchar_notify_add(struct mtd_info *mtd)

{

}



static void mtdchar_notify_remove(struct mtd_info *mtd)

{

	struct inode *mtd_ino = ilookup(mtd_inode_mnt->mnt_sb, mtd->index);



	if (mtd_ino) {

		/* Destroy the inode if it exists */

		clear_nlink(mtd_ino);

		iput(mtd_ino);

	}

}



static struct mtd_notifier mtdchar_notifier = {

	.add = mtdchar_notify_add,

	.remove = mtdchar_notify_remove,

};



static int __init init_mtdchar(void)

{

	int ret;
@@ -1224,19 +1216,8 @@ static int __init init_mtdchar(void) 
		pr_notice("Can't register mtd_inodefs filesystem: %d\n", ret);

		goto err_unregister_chdev;

	}



	mtd_inode_mnt = kern_mount(&mtd_inodefs_type);

	if (IS_ERR(mtd_inode_mnt)) {

		ret = PTR_ERR(mtd_inode_mnt);

		pr_notice("Error mounting mtd_inodefs filesystem: %d\n", ret);

		goto err_unregister_filesystem;

	}

	register_mtd_user(&mtdchar_notifier);



	return ret;



err_unregister_filesystem:

	unregister_filesystem(&mtd_inodefs_type);

err_unregister_chdev:

	__unregister_chrdev(MTD_CHAR_MAJOR, 0, 1 << MINORBITS, "mtd");

	return ret;
@@ -1244,8 +1225,6 @@ err_unregister_chdev: 


static void __exit cleanup_mtdchar(void)

{

	unregister_mtd_user(&mtdchar_notifier);

	kern_unmount(mtd_inode_mnt);

	unregister_filesystem(&mtd_inodefs_type);

	__unregister_chrdev(MTD_CHAR_MAJOR, 0, 1 << MINORBITS, "mtd");

}

fs/aio.c

+11 −21
Original line number Diff line number Diff line
@@ -305,15 +305,18 @@ out_freectx: 
	return ERR_PTR(err);

}



/* aio_cancel_all

/* kill_ctx

 *	Cancels all outstanding aio requests on an aio context.  Used 

 *	when the processes owning a context have all exited to encourage 

 *	the rapid destruction of the kioctx.

 */

static void aio_cancel_all(struct kioctx *ctx)

static void kill_ctx(struct kioctx *ctx)

{

	int (*cancel)(struct kiocb *, struct io_event *);

	struct task_struct *tsk = current;

	DECLARE_WAITQUEUE(wait, tsk);

	struct io_event res;



	spin_lock_irq(&ctx->ctx_lock);

	ctx->dead = 1;

	while (!list_empty(&ctx->active_reqs)) {
@@ -329,15 +332,7 @@ static void aio_cancel_all(struct kioctx *ctx) 
			spin_lock_irq(&ctx->ctx_lock);

		}

	}

	spin_unlock_irq(&ctx->ctx_lock);

}



static void wait_for_all_aios(struct kioctx *ctx)

{

	struct task_struct *tsk = current;

	DECLARE_WAITQUEUE(wait, tsk);



	spin_lock_irq(&ctx->ctx_lock);

	if (!ctx->reqs_active)

		goto out;
@@ -387,9 +382,7 @@ void exit_aio(struct mm_struct *mm) 
		ctx = hlist_entry(mm->ioctx_list.first, struct kioctx, list);

		hlist_del_rcu(&ctx->list);



		aio_cancel_all(ctx);



		wait_for_all_aios(ctx);

		kill_ctx(ctx);



		if (1 != atomic_read(&ctx->users))

			printk(KERN_DEBUG
@@ -1269,8 +1262,7 @@ static void io_destroy(struct kioctx *ioctx) 
	if (likely(!was_dead))

		put_ioctx(ioctx);	/* twice for the list */



	aio_cancel_all(ioctx);

	wait_for_all_aios(ioctx);

	kill_ctx(ioctx);



	/*

	 * Wake up any waiters.  The setting of ctx->dead must be seen
@@ -1278,7 +1270,6 @@ static void io_destroy(struct kioctx *ioctx) 
	 * locking done by the above calls to ensure this consistency.

	 */

	wake_up_all(&ioctx->wait);

	put_ioctx(ioctx);	/* once for the lookup */

}



/* sys_io_setup:
@@ -1315,11 +1306,9 @@ SYSCALL_DEFINE2(io_setup, unsigned, nr_events, aio_context_t __user *, ctxp) 
	ret = PTR_ERR(ioctx);

	if (!IS_ERR(ioctx)) {

		ret = put_user(ioctx->user_id, ctxp);

		if (!ret) {

			put_ioctx(ioctx);

			return 0;

		}

		if (ret)

			io_destroy(ioctx);

		put_ioctx(ioctx);

	}



out:
@@ -1337,6 +1326,7 @@ SYSCALL_DEFINE1(io_destroy, aio_context_t, ctx) 
	struct kioctx *ioctx = lookup_ioctx(ctx);

	if (likely(NULL != ioctx)) {

		io_destroy(ioctx);

		put_ioctx(ioctx);

		return 0;

	}

	pr_debug("EINVAL: io_destroy: invalid context id\n");

fs/ext2/ext2.h

+631 −0

File changed.

Preview size limit exceeded, changes collapsed.

fs/ext2/xattr_security.c

+1 −4
Original line number Diff line number Diff line
@@ -3,10 +3,7 @@ 
 * Handler for storing security labels as extended attributes.

 */



#include <linux/slab.h>

#include <linux/string.h>

#include <linux/fs.h>

#include <linux/ext2_fs.h>

#include "ext2.h"

#include <linux/security.h>

#include "xattr.h"