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

Commit 2844a487 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (Fixes from Andrew) 

Merge misc fixes from Andrew Morton:
 "8 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (8 patches)
  futex: avoid wake_futex() for a PI futex_q
  watchdog: using u64 in get_sample_period()
  writeback: put unused inodes to LRU after writeback completion
  mm: vmscan: check for fatal signals iff the process was throttled
  Revert "mm: remove __GFP_NO_KSWAPD"
  proc: check vma->vm_file before dereferencing
  UAPI: strip the _UAPI prefix from header guards during header installation
  include/linux/bug.h: fix sparse warning related to BUILD_BUG_ON_INVALID
parents 5687100a aa10990e

drivers/mtd/mtdcore.c

+4 −2
Original line number Diff line number Diff line
@@ -1077,7 +1077,8 @@ EXPORT_SYMBOL_GPL(mtd_writev); 
 * until the request succeeds or until the allocation size falls below

 * the system page size. This attempts to make sure it does not adversely

 * impact system performance, so when allocating more than one page, we

 * ask the memory allocator to avoid re-trying.

 * ask the memory allocator to avoid re-trying, swapping, writing back

 * or performing I/O.

 *

 * Note, this function also makes sure that the allocated buffer is aligned to

 * the MTD device's min. I/O unit, i.e. the "mtd->writesize" value.
@@ -1091,7 +1092,8 @@ EXPORT_SYMBOL_GPL(mtd_writev); 
 */

void *mtd_kmalloc_up_to(const struct mtd_info *mtd, size_t *size)

{

	gfp_t flags = __GFP_NOWARN | __GFP_WAIT | __GFP_NORETRY;

	gfp_t flags = __GFP_NOWARN | __GFP_WAIT |

		       __GFP_NORETRY | __GFP_NO_KSWAPD;

	size_t min_alloc = max_t(size_t, mtd->writesize, PAGE_SIZE);

	void *kbuf;

fs/fs-writeback.c

+2 −0
Original line number Diff line number Diff line
@@ -228,6 +228,8 @@ static void requeue_io(struct inode *inode, struct bdi_writeback *wb) 
static void inode_sync_complete(struct inode *inode)

{

	inode->i_state &= ~I_SYNC;

	/* If inode is clean an unused, put it into LRU now... */

	inode_add_lru(inode);

	/* Waiters must see I_SYNC cleared before being woken up */

	smp_mb();

	wake_up_bit(&inode->i_state, __I_SYNC);

fs/inode.c

+14 −2
Original line number Diff line number Diff line
@@ -408,6 +408,19 @@ static void inode_lru_list_add(struct inode *inode) 
	spin_unlock(&inode->i_sb->s_inode_lru_lock);

}



/*

 * Add inode to LRU if needed (inode is unused and clean).

 *

 * Needs inode->i_lock held.

 */

void inode_add_lru(struct inode *inode)

{

	if (!(inode->i_state & (I_DIRTY | I_SYNC | I_FREEING | I_WILL_FREE)) &&

	    !atomic_read(&inode->i_count) && inode->i_sb->s_flags & MS_ACTIVE)

		inode_lru_list_add(inode);

}





static void inode_lru_list_del(struct inode *inode)

{

	spin_lock(&inode->i_sb->s_inode_lru_lock);
@@ -1390,8 +1403,7 @@ static void iput_final(struct inode *inode) 


	if (!drop && (sb->s_flags & MS_ACTIVE)) {

		inode->i_state |= I_REFERENCED;

		if (!(inode->i_state & (I_DIRTY|I_SYNC)))

			inode_lru_list_add(inode);

		inode_add_lru(inode);

		spin_unlock(&inode->i_lock);

		return;

	}

fs/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ extern int open_check_o_direct(struct file *f); 
 * inode.c

 */

extern spinlock_t inode_sb_list_lock;

extern void inode_add_lru(struct inode *inode);



/*

 * fs-writeback.c

fs/proc/base.c

+3 −2
Original line number Diff line number Diff line
@@ -1877,6 +1877,7 @@ static struct dentry *proc_map_files_lookup(struct inode *dir, 
	if (!vma)

		goto out_no_vma;



	if (vma->vm_file)

		result = proc_map_files_instantiate(dir, dentry, task,

				(void *)(unsigned long)vma->vm_file->f_mode);