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

Commit c8ae067f 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 fixes from Al Viro:
 "Fixes for crap of assorted ages: EOPENSTALE one is 4.2+, autofs one is
  4.6, d_walk - 3.2+.

  The atomic_open() and coredump ones are regressions from this window"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  coredump: fix dumping through pipes
  fix a regression in atomic_open()
  fix d_walk()/non-delayed __d_free() race
  autofs braino fix for do_last()
  fix EOPENSTALE bug in do_last()
parents 2051877c 1607f09c

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

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int spufs_arch_write_note(struct spu_context *ctx, int i, 
	if (rc < 0)

		goto out;



	skip = roundup(cprm->file->f_pos - total + sz, 4) - cprm->file->f_pos;

	skip = roundup(cprm->pos - total + sz, 4) - cprm->pos;

	if (!dump_skip(cprm, skip))

		goto Eio;

out:

fs/binfmt_elf.c

+1 −1
Original line number Diff line number Diff line
@@ -2275,7 +2275,7 @@ static int elf_core_dump(struct coredump_params *cprm) 
		goto end_coredump;



	/* Align to page */

	if (!dump_skip(cprm, dataoff - cprm->file->f_pos))

	if (!dump_skip(cprm, dataoff - cprm->pos))

		goto end_coredump;



	for (i = 0, vma = first_vma(current, gate_vma); vma != NULL;

fs/binfmt_elf_fdpic.c

+1 −1
Original line number Diff line number Diff line
@@ -1787,7 +1787,7 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm) 
				goto end_coredump;

	}



	if (!dump_skip(cprm, dataoff - cprm->file->f_pos))

	if (!dump_skip(cprm, dataoff - cprm->pos))

		goto end_coredump;



	if (!elf_fdpic_dump_segments(cprm))

fs/coredump.c

+3 −1
Original line number Diff line number Diff line
@@ -794,6 +794,7 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr) 
			return 0;

		file->f_pos = pos;

		cprm->written += n;

		cprm->pos += n;

		nr -= n;

	}

	return 1;
@@ -808,6 +809,7 @@ int dump_skip(struct coredump_params *cprm, size_t nr) 
		if (dump_interrupted() ||

		    file->f_op->llseek(file, nr, SEEK_CUR) < 0)

			return 0;

		cprm->pos += nr;

		return 1;

	} else {

		while (nr > PAGE_SIZE) {
@@ -822,7 +824,7 @@ EXPORT_SYMBOL(dump_skip); 


int dump_align(struct coredump_params *cprm, int align)

{

	unsigned mod = cprm->file->f_pos & (align - 1);

	unsigned mod = cprm->pos & (align - 1);

	if (align & (align - 1))

		return 0;

	return mod ? dump_skip(cprm, align - mod) : 1;

fs/dcache.c

+2 −2
Original line number Diff line number Diff line
@@ -1636,7 +1636,7 @@ struct dentry *d_alloc(struct dentry * parent, const struct qstr *name) 
	struct dentry *dentry = __d_alloc(parent->d_sb, name);

	if (!dentry)

		return NULL;



	dentry->d_flags |= DCACHE_RCUACCESS;

	spin_lock(&parent->d_lock);

	/*

	 * don't need child lock because it is not subject
@@ -2358,7 +2358,6 @@ static void __d_rehash(struct dentry * entry, struct hlist_bl_head *b) 
{

	BUG_ON(!d_unhashed(entry));

	hlist_bl_lock(b);

	entry->d_flags |= DCACHE_RCUACCESS;

	hlist_bl_add_head_rcu(&entry->d_hash, b);

	hlist_bl_unlock(b);

}
@@ -2843,6 +2842,7 @@ static void __d_move(struct dentry *dentry, struct dentry *target, 
	/* ... and switch them in the tree */

	if (IS_ROOT(dentry)) {

		/* splicing a tree */

		dentry->d_flags |= DCACHE_RCUACCESS;

		dentry->d_parent = target->d_parent;

		target->d_parent = target;

		list_del_init(&target->d_child);