Skip to contentSkip to conversation

Patch "f2fs: do f2fs_balance_fs when block is allocated" has been added to the 4.5-stable tree

PATCH [email protected] 1 participant 1 message May 2, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

f2fs: do f2fs_balance_fs when block is allocated

to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
f2fs-do-f2fs_balance_fs-when-block-is-allocated.patch
and it can be found in the queue-4.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

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

From: Jaegeuk Kim <[email protected]>
Date: Sat, 23 Jan 2016 13:35:18 -0800
Subject: f2fs: do f2fs_balance_fs when block is allocated

From: Jaegeuk Kim <[email protected]>

commit 3c082b7b5b28be606ed9ef11e4741df7c722c92e upstream.

We should consider data block allocation to trigger f2fs_balance_fs.

---
 fs/f2fs/data.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
fs/f2fs/data.c +6 -6
@@ -504,7 +504,7 @@ static int __allocate_data_blocks(struct
 	struct dnode_of_data dn;
 	u64 start = F2FS_BYTES_TO_BLK(offset);
 	u64 len = F2FS_BYTES_TO_BLK(count);
-	bool allocated;
+	bool allocated = false;
 	u64 end_offset;
 	int err = 0;
 
@@ -546,7 +546,7 @@ static int __allocate_data_blocks(struct
 		f2fs_put_dnode(&dn);
 		f2fs_unlock_op(sbi);
 
-		f2fs_balance_fs(sbi, dn.node_changed);
+		f2fs_balance_fs(sbi, allocated);
 	}
 	return err;
 
@@ -556,7 +556,7 @@ sync_out:
 	f2fs_put_dnode(&dn);
 out:
 	f2fs_unlock_op(sbi);
-	f2fs_balance_fs(sbi, dn.node_changed);
+	f2fs_balance_fs(sbi, allocated);
 	return err;
 }
 
@@ -650,14 +650,14 @@ get_next:
 	if (dn.ofs_in_node >= end_offset) {
 		if (allocated)
 			sync_inode_page(&dn);
-		allocated = false;
 		f2fs_put_dnode(&dn);
 
 		if (create) {
 			f2fs_unlock_op(sbi);
-			f2fs_balance_fs(sbi, dn.node_changed);
+			f2fs_balance_fs(sbi, allocated);
 			f2fs_lock_op(sbi);
 		}
+		allocated = false;
 
 		set_new_dnode(&dn, inode, NULL, NULL, 0);
 		err = get_dnode_of_data(&dn, pgofs, mode);
@@ -715,7 +715,7 @@ put_out:
 unlock_out:
 	if (create) {
 		f2fs_unlock_op(sbi);
-		f2fs_balance_fs(sbi, dn.node_changed);
+		f2fs_balance_fs(sbi, allocated);
 	}
 out:
 	trace_f2fs_map_blocks(inode, map, err);

Patches currently in stable-queue which might be from [email protected] are

queue-4.5/f2fs-cover-large-section-in-sanity-check-of-super.patch queue-4.5/f2fs-slightly-reorganize-read_raw_super_block.patch queue-4.5/f2fs-do-f2fs_balance_fs-when-block-is-allocated.patch queue-4.5/f2fs-don-t-need-to-call-set_page_dirty-for-io-error.patch queue-4.5/f2fs-crypto-handle-unexpected-lack-of-encryption-keys.patch queue-4.5/f2fs-crypto-fix-corrupted-symlink-in-encrypted-case.patch queue-4.5/f2fs-crypto-make-sure-the-encryption-info-is-initialized-on-opendir-2.patch queue-4.5/ext4-fscrypto-avoid-rcu-lookup-in-d_revalidate.patch