Attachment 277405 Details for Bug 471249

[patch] proposed fix

loop-barrier2-fix.patch (text/plain), 1.52 KB, created by Forgotten User sLJ7K2dvxj on 2009-03-05 16:20:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Forgotten User sLJ7K2dvxj

Created: 2009-03-05 16:20:56 UTC

Size: 1.52 KB

patch

obsolete

>---
> drivers/block/loop.c |   30 ++++++++++++++++++++++++++++--
> 1 file changed, 28 insertions(+), 2 deletions(-)
>
>Index: linux-2.6.28-master/drivers/block/loop.c
>===================================================================
>--- linux-2.6.28-master.orig/drivers/block/loop.c	2009-03-05 16:55:52.000000000 +0100
>+++ linux-2.6.28-master/drivers/block/loop.c	2009-03-05 17:15:24.000000000 +0100
>@@ -234,6 +234,32 @@ static int sync_file(struct file * file,
> 	return ret;
> }
> 
>+static int sync_file_unlocked(struct file *file)
>+{
>+	struct address_space *mapping;
>+	int ret;
>+
>+	if (!file->f_op || !file->f_op->fsync)
>+		return -EOPNOTSUPP;
>+
>+	mapping = file->f_mapping;
>+
>+	ret = filemap_fdatawrite(mapping);
>+	if (!ret) {
>+		int ret2;
>+
>+		mutex_lock(&mapping->host->i_mutex);
>+		ret = file->f_op->fsync(file, file->f_dentry, 1);
>+		mutex_unlock(&mapping->host->i_mutex);
>+
>+		ret2 = filemap_fdatawait(mapping);
>+		if (!ret)
>+			ret = ret2;
>+	}
>+
>+	return ret;
>+}
>+
> /**
>  * do_lo_send_aops - helper for writing data to a loop device
>  *
>@@ -525,7 +551,7 @@ static int do_bio_filebacked(struct loop
> 	int barrier = bio_barrier(bio);
> 
> 	if (barrier) {
>-		ret = sync_file(lo->lo_backing_file, 1);
>+		ret = sync_file_unlocked(lo->lo_backing_file);
> 		if (unlikely(ret))
> 			return ret;
> 	}
>@@ -537,7 +563,7 @@ static int do_bio_filebacked(struct loop
> 		ret = lo_receive(lo, bio, lo->lo_blocksize, pos);
> 
> 	if ((barrier || sync) && !ret)
>-		ret = sync_file(lo->lo_backing_file, 1);
>+		ret = sync_file_unlocked(lo->lo_backing_file);
> 
> 	return ret;
> }

Actions: View | Diff

Attachments on bug 471249: 277405