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

Commit 1dd909af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew Morton) 

Merge misc fixes from Andrew Morton:
 "10 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  slab: fix nodeid bounds check for non-contiguous node IDs
  lib/genalloc.c: export devm_gen_pool_create() for modules
  mm: fix anon_vma_clone() error treatment
  mm: fix swapoff hang after page migration and fork
  fat: fix oops on corrupted vfat fs
  ipc/sem.c: fully initialize sem_array before making it visible
  drivers/input/evdev.c: don't kfree() a vmalloc address
  mm/vmpressure.c: fix race in vmpressure_work_fn()
  mm: frontswap: invalidate expired data on a dup-store failure
  mm: do not overwrite reserved pages counter at show_mem()
parents 3a18ca06 7c3fbbdd

drivers/input/evdev.c

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ static int evdev_open(struct inode *inode, struct file *file) 


 err_free_client:

	evdev_detach_client(evdev, client);

	kfree(client);

	kvfree(client);

	return error;

}

fs/fat/namei_vfat.c

+11 −9
Original line number Diff line number Diff line
@@ -736,7 +736,12 @@ static struct dentry *vfat_lookup(struct inode *dir, struct dentry *dentry, 
	}



	alias = d_find_alias(inode);

	if (alias && !vfat_d_anon_disconn(alias)) {

	/*

	 * Checking "alias->d_parent == dentry->d_parent" to make sure

	 * FS is not corrupted (especially double linked dir).

	 */

	if (alias && alias->d_parent == dentry->d_parent &&

	    !vfat_d_anon_disconn(alias)) {

		/*

		 * This inode has non anonymous-DCACHE_DISCONNECTED

		 * dentry. This means, the user did ->lookup() by an
@@ -755,12 +760,9 @@ static struct dentry *vfat_lookup(struct inode *dir, struct dentry *dentry, 


out:

	mutex_unlock(&MSDOS_SB(sb)->s_lock);

	dentry->d_time = dentry->d_parent->d_inode->i_version;

	dentry = d_splice_alias(inode, dentry);

	if (dentry)

		dentry->d_time = dentry->d_parent->d_inode->i_version;

	return dentry;



	if (!inode)

		dentry->d_time = dir->i_version;

	return d_splice_alias(inode, dentry);

error:

	mutex_unlock(&MSDOS_SB(sb)->s_lock);

	return ERR_PTR(err);
@@ -793,7 +795,6 @@ static int vfat_create(struct inode *dir, struct dentry *dentry, umode_t mode, 
	inode->i_mtime = inode->i_atime = inode->i_ctime = ts;

	/* timestamp is already written, so mark_inode_dirty() is unneeded. */



	dentry->d_time = dentry->d_parent->d_inode->i_version;

	d_instantiate(dentry, inode);

out:

	mutex_unlock(&MSDOS_SB(sb)->s_lock);
@@ -824,6 +825,7 @@ static int vfat_rmdir(struct inode *dir, struct dentry *dentry) 
	clear_nlink(inode);

	inode->i_mtime = inode->i_atime = CURRENT_TIME_SEC;

	fat_detach(inode);

	dentry->d_time = dir->i_version;

out:

	mutex_unlock(&MSDOS_SB(sb)->s_lock);
@@ -849,6 +851,7 @@ static int vfat_unlink(struct inode *dir, struct dentry *dentry) 
	clear_nlink(inode);

	inode->i_mtime = inode->i_atime = CURRENT_TIME_SEC;

	fat_detach(inode);

	dentry->d_time = dir->i_version;

out:

	mutex_unlock(&MSDOS_SB(sb)->s_lock);
@@ -889,7 +892,6 @@ static int vfat_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) 
	inode->i_mtime = inode->i_atime = inode->i_ctime = ts;

	/* timestamp is already written, so mark_inode_dirty() is unneeded. */



	dentry->d_time = dentry->d_parent->d_inode->i_version;

	d_instantiate(dentry, inode);



	mutex_unlock(&MSDOS_SB(sb)->s_lock);

ipc/sem.c

+8 −7
Original line number Diff line number Diff line
@@ -507,13 +507,6 @@ static int newary(struct ipc_namespace *ns, struct ipc_params *params) 
		return retval;

	}



	id = ipc_addid(&sem_ids(ns), &sma->sem_perm, ns->sc_semmni);

	if (id < 0) {

		ipc_rcu_putref(sma, sem_rcu_free);

		return id;

	}

	ns->used_sems += nsems;



	sma->sem_base = (struct sem *) &sma[1];



	for (i = 0; i < nsems; i++) {
@@ -528,6 +521,14 @@ static int newary(struct ipc_namespace *ns, struct ipc_params *params) 
	INIT_LIST_HEAD(&sma->list_id);

	sma->sem_nsems = nsems;

	sma->sem_ctime = get_seconds();



	id = ipc_addid(&sem_ids(ns), &sma->sem_perm, ns->sc_semmni);

	if (id < 0) {

		ipc_rcu_putref(sma, sem_rcu_free);

		return id;

	}

	ns->used_sems += nsems;



	sem_unlock(sma, -1);

	rcu_read_unlock();

lib/genalloc.c

+1 −0
Original line number Diff line number Diff line
@@ -598,6 +598,7 @@ struct gen_pool *devm_gen_pool_create(struct device *dev, int min_alloc_order, 


	return pool;

}

EXPORT_SYMBOL(devm_gen_pool_create);



/**

 * dev_get_gen_pool - Obtain the gen_pool (if any) for a device

lib/show_mem.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ void show_mem(unsigned int filter) 
				continue;



			total += zone->present_pages;

			reserved = zone->present_pages - zone->managed_pages;

			reserved += zone->present_pages - zone->managed_pages;



			if (is_highmem_idx(zoneid))

				highmem += zone->present_pages;