[kernel] r22782 - dists/sid/linux/debian/patches/features/all/rt

[Ben Hutchings]

Author: benh
Date: Wed Jul  1 02:25:41 2015
New Revision: 22782

Log:
Refresh rt patchset

Modified:
   dists/sid/linux/debian/patches/features/all/rt/fs-aio-simple-simple-work.patch

Modified: dists/sid/linux/debian/patches/features/all/rt/fs-aio-simple-simple-work.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/all/rt/fs-aio-simple-simple-work.patch	Wed Jul  1 00:34:40 2015	(r22781)
+++ dists/sid/linux/debian/patches/features/all/rt/fs-aio-simple-simple-work.patch	Wed Jul  1 02:25:41 2015	(r22782)
@@ -39,7 +39,7 @@
  
  #include <asm/kmap_types.h>
  #include <asm/uaccess.h>
-@@ -110,7 +111,7 @@ struct kioctx {
+@@ -115,7 +116,7 @@ struct kioctx {
  	struct page		**ring_pages;
  	long			nr_pages;
  
@@ -48,7 +48,7 @@
  
  	/*
  	 * signals when all in-flight requests are done
-@@ -216,6 +217,7 @@ static int __init aio_setup(void)
+@@ -221,6 +222,7 @@ static int __init aio_setup(void)
  		.mount		= aio_mount,
  		.kill_sb	= kill_anon_super,
  	};
@@ -56,7 +56,7 @@
  	aio_mnt = kern_mount(&aio_fs);
  	if (IS_ERR(aio_mnt))
  		panic("Failed to create aio fs mount.");
-@@ -521,9 +523,9 @@ static int kiocb_cancel(struct kiocb *ki
+@@ -526,9 +528,9 @@ static int kiocb_cancel(struct kiocb *ki
  	return cancel(kiocb);
  }
  
@@ -68,9 +68,9 @@
  
  	pr_debug("freeing %p\n", ctx);
  
-@@ -542,8 +544,8 @@ static void free_ioctx_reqs(struct percp
- 	if (ctx->requests_done)
- 		complete(ctx->requests_done);
+@@ -547,8 +549,8 @@ static void free_ioctx_reqs(struct percp
+ 	if (ctx->rq_wait && atomic_dec_and_test(&ctx->rq_wait->count))
+ 		complete(&ctx->rq_wait->comp);
  
 -	INIT_WORK(&ctx->free_work, free_ioctx);
 -	schedule_work(&ctx->free_work);
@@ -79,7 +79,7 @@
  }
  
  /*
-@@ -551,9 +553,9 @@ static void free_ioctx_reqs(struct percp
+@@ -556,9 +558,9 @@ static void free_ioctx_reqs(struct percp
   * and ctx->users has dropped to 0, so we know no more kiocbs can be submitted -
   * now it's safe to cancel any that need to be.
   */
@@ -91,7 +91,7 @@
  	struct kiocb *req;
  
  	spin_lock_irq(&ctx->ctx_lock);
-@@ -572,6 +574,14 @@ static void free_ioctx_users(struct perc
+@@ -577,6 +579,14 @@ static void free_ioctx_users(struct perc
  	percpu_ref_put(&ctx->reqs);
  }