===================================================================
@@ -21,7 +21,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/workqueue.h>
-#include <linux/mutex.h>
+#include <linux/spinlock.h>
#include <linux/delay.h>
#include <linux/device-mapper.h>
#include <linux/dm-kcopyd.h>
@@ -356,7 +356,7 @@ struct kcopyd_job {
* These fields are only used if the job has been split
* into more manageable parts.
*/
- struct mutex lock;
+ spinlock_t lock;
atomic_t sub_jobs;
sector_t progress;
@@ -629,7 +629,7 @@ static void segment_complete(int read_er
struct kcopyd_job *job = sub_job->master_job;
struct dm_kcopyd_client *kc = job->kc;
- mutex_lock(&job->lock);
+ spin_lock(&job->lock);
/* update the error */
if (read_err)
@@ -653,7 +653,7 @@ static void segment_complete(int read_er
job->progress += count;
}
}
- mutex_unlock(&job->lock);
+ spin_unlock(&job->lock);
if (count) {
int i;
@@ -708,7 +708,7 @@ static void submit_job(struct kcopyd_job
if (job->source.count <= SUB_JOB_SIZE)
dispatch_job(job);
else {
- mutex_init(&job->lock);
+ spin_lock_init(&job->lock);
job->progress = 0;
split_job(job);
}
job->lock is only taken for a finite amount of time and the process doesn't block while holding it, so change it from mutex to spinlock. This change is needed for the next patch that makes it possible to call segment_complete from an interrupt. Taking mutexes inside an interrupt is not allowed. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> --- drivers/md/dm-kcopyd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-block" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html