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

Commit 9a100a44 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-2 

* git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-2:
  async: make async a command line option for now
  partial revert of asynchronous inode delete
parents 0d34052d cdb80f63

fs/inode.c

+7 −12
Original line number Diff line number Diff line
@@ -1139,11 +1139,16 @@ EXPORT_SYMBOL(remove_inode_hash); 
 * I_FREEING is set so that no-one will take a new reference to the inode while

 * it is being deleted.

 */

static void generic_delete_inode_async(void *data, async_cookie_t cookie)

void generic_delete_inode(struct inode *inode)

{

	struct inode *inode = data;

	const struct super_operations *op = inode->i_sb->s_op;



	list_del_init(&inode->i_list);

	list_del_init(&inode->i_sb_list);

	inode->i_state |= I_FREEING;

	inodes_stat.nr_inodes--;

	spin_unlock(&inode_lock);



	security_inode_delete(inode);



	if (op->delete_inode) {
@@ -1167,16 +1172,6 @@ static void generic_delete_inode_async(void *data, async_cookie_t cookie) 
	destroy_inode(inode);

}



void generic_delete_inode(struct inode *inode)

{

	list_del_init(&inode->i_list);

	list_del_init(&inode->i_sb_list);

	inode->i_state |= I_FREEING;

	inodes_stat.nr_inodes--;

	spin_unlock(&inode_lock);

	async_schedule_special(generic_delete_inode_async, inode, &inode->i_sb->s_async_list);

}



EXPORT_SYMBOL(generic_delete_inode);



static void generic_forget_inode(struct inode *inode)

kernel/async.c

+14 −2
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ static LIST_HEAD(async_pending); 
static LIST_HEAD(async_running);

static DEFINE_SPINLOCK(async_lock);



static int async_enabled = 0;



struct async_entry {

	struct list_head list;

	async_cookie_t   cookie;
@@ -169,7 +171,7 @@ static async_cookie_t __async_schedule(async_func_ptr *ptr, void *data, struct l 
	 * If we're out of memory or if there's too much work

	 * pending already, we execute synchronously.

	 */

	if (!entry || atomic_read(&entry_count) > MAX_WORK) {

	if (!async_enabled || !entry || atomic_read(&entry_count) > MAX_WORK) {

		kfree(entry);

		spin_lock_irqsave(&async_lock, flags);

		newcookie = next_cookie++;
@@ -316,8 +318,18 @@ static int async_manager_thread(void *unused) 


static int __init async_init(void)

{

	if (async_enabled)

		kthread_run(async_manager_thread, NULL, "async/mgr");

	return 0;

}



static int __init setup_async(char *str)

{

	async_enabled = 1;

	return 1;

}



__setup("fastboot", setup_async);





core_initcall(async_init);