From 3db3c3fb840ed4a6c7666d1464959edd40fe54f1 Mon Sep 17 00:00:00 2001

From: Tetsuhiro Kohada <kohada.t2@gmail.com>

Date: Tue, 23 Jun 2020 15:22:19 +0900

Subject: [Backport 3db3c3fb840e] exfat: write multiple sectors at once

Write multiple sectors at once when updating dir-entries.

Add exfat_update_bhs() for that. It wait for write completion once

instead of sector by sector.

It's only effective if sync enabled.

Signed-off-by: Tetsuhiro Kohada <kohada.t2@gmail.com>

Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>

---

 src/dir.c      | 15 +++++++++------

 src/exfat_fs.h |  1 +

 src/misc.c     | 19 +++++++++++++++++++

 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/dir.c b/src/dir.c

index 97296bc2b241cbe40b9a87e1f11ef8c203881680..542f1a5ab56fd60a2498f4437c85875cb07e9ef2 100644

--- a/src/dir.c

+++ b/src/dir.c

@@ -606,13 +606,16 @@ void exfat_update_dir_chksum_with_entry_set(struct exfat_entry_set_cache *es)

 void exfat_free_dentry_set(struct exfat_entry_set_cache *es, int sync)

 {

-	int i;

+	int i, err = 0;

-	for (i = 0; i < es->num_bh; i++) {

-		if (es->modified)

-			exfat_update_bh(es->bh[i], sync);

-		brelse(es->bh[i]);

-	}

+	if (es->modified)

+		err = exfat_update_bhs(es->bh, es->num_bh, sync);

+

+	for (i = 0; i < es->num_bh; i++)

+		if (err)

+			bforget(es->bh[i]);

+		else

+			brelse(es->bh[i]);

 	kfree(es);

 }

diff --git a/src/exfat_fs.h b/src/exfat_fs.h

index 05553b2924ee313d9341bc8585f2290a10e8ff56..af0f526eece7bd05caa6a1b7fae28701776df5ed 100644

--- a/src/exfat_fs.h

+++ b/src/exfat_fs.h

@@ -513,6 +513,7 @@ void exfat_set_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts,

 u16 exfat_calc_chksum16(void *data, int len, u16 chksum, int type);

 u32 exfat_calc_chksum32(void *data, int len, u32 chksum, int type);

 void exfat_update_bh(struct buffer_head *bh, int sync);

+int exfat_update_bhs(struct buffer_head **bhs, int nr_bhs, int sync);

 void exfat_chain_set(struct exfat_chain *ec, unsigned int dir,

 		unsigned int size, unsigned char flags);

 void exfat_chain_dup(struct exfat_chain *dup, struct exfat_chain *ec);

diff --git a/src/misc.c b/src/misc.c

index 8a3dde59052bf04a4de6f65554df14ed6f185147..d34e6193258dd37117dba5fe27b5323b82dfedef 100644

--- a/src/misc.c

+++ b/src/misc.c

@@ -172,6 +172,25 @@ void exfat_update_bh(struct buffer_head *bh, int sync)

 		sync_dirty_buffer(bh);

 }

+int exfat_update_bhs(struct buffer_head **bhs, int nr_bhs, int sync)

+{

+	int i, err = 0;

+

+	for (i = 0; i < nr_bhs; i++) {

+		set_buffer_uptodate(bhs[i]);

+		mark_buffer_dirty(bhs[i]);

+		if (sync)

+			write_dirty_buffer(bhs[i], 0);

+	}

+

+	for (i = 0; i < nr_bhs && sync; i++) {

+		wait_on_buffer(bhs[i]);

+		if (!err && !buffer_uptodate(bhs[i]))

+			err = -EIO;

+	}

+	return err;

+}

+

 void exfat_chain_set(struct exfat_chain *ec, unsigned int dir,

 		unsigned int size, unsigned char flags)

 {

-- 

2.31.1