Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1339314 > unrolled thread

[PATCH 1/3] Btrfs: disk-io: fixed a brace coding style issue

Back to article view | Back to linux.kernel

Contents

  [PATCH 1/3] Btrfs: disk-io: fixed a brace coding style issue Philippe Loctaux <phil@philippeloctaux.com> - 2016-02-22 11:20 +0100
    [PATCH 2/3] Btrfs: disk-io: fixed an assignment error Philippe Loctaux <phil@philippeloctaux.com> - 2016-02-22 12:00 +0100
    [PATCH 3/3] Btrfs: disk-io: fixed a comment block coding style issue Philippe Loctaux <phil@philippeloctaux.com> - 2016-02-22 12:40 +0100

#1339314 — [PATCH 1/3] Btrfs: disk-io: fixed a brace coding style issue

Fixed a coding style issue.

Signed-off-by: Philippe Loctaux <phil@philippeloctaux.com>
---
 fs/btrfs/disk-io.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 4545e2e..84cbf16 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1908,11 +1908,11 @@ static int transaction_kthread(void *arg)
 				cannot_commit = true;
 			goto sleep;
 		}
-		if (transid == trans->transid) {
+		if (transid == trans->transid)
 			btrfs_commit_transaction(trans, root);
-		} else {
+		else
 			btrfs_end_transaction(trans, root);
-		}
+
 sleep:
 		wake_up_process(root->fs_info->cleaner_kthread);
 		mutex_unlock(&root->fs_info->transaction_kthread_mutex);
@@ -1978,11 +1978,11 @@ static void find_oldest_super_backup(struct btrfs_fs_info *info,
 
 	newest_index = find_newest_super_backup(info, newest_gen);
 	/* if there was garbage in there, just move along */
-	if (newest_index == -1) {
+	if (newest_index == -1)
 		info->backup_root_index = 0;
-	} else {
+	else
 		info->backup_root_index = (newest_index + 1) % BTRFS_NUM_BACKUP_ROOTS;
-	}
+
 }
 
 /*
-- 
2.7.1

[toc] | [next] | [standalone]

#1339336 — [PATCH 2/3] Btrfs: disk-io: fixed an assignment error

Added spaces required around the equal sign, fixing a checkpatch error.

Signed-off-by: Philippe Loctaux <phil@philippeloctaux.com>
---
 fs/btrfs/disk-io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 84cbf16..f642b30 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -4412,7 +4412,7 @@ void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans,
 	btrfs_destroy_pinned_extent(root,
 				    root->fs_info->pinned_extents);
 
-	cur_trans->state =TRANS_STATE_COMPLETED;
+	cur_trans->state = TRANS_STATE_COMPLETED;
 	wake_up(&cur_trans->commit_wait);
 
 	/*
-- 
2.7.1

[toc] | [prev] | [next] | [standalone]

#1339402 — [PATCH 3/3] Btrfs: disk-io: fixed a comment block coding style issue

Makes the comment block start with /* on a separate line, and end
with */ on a separate line as well.

Signed-off-by: Philippe Loctaux <phil@philippeloctaux.com>
---
 fs/btrfs/disk-io.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index f642b30..2545d01 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -4416,9 +4416,9 @@ void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans,
 	wake_up(&cur_trans->commit_wait);
 
 	/*
-	memset(cur_trans, 0, sizeof(*cur_trans));
-	kmem_cache_free(btrfs_transaction_cachep, cur_trans);
-	*/
+	 * memset(cur_trans, 0, sizeof(*cur_trans));
+	 * kmem_cache_free(btrfs_transaction_cachep, cur_trans);
+	 */
 }
 
 static int btrfs_cleanup_transaction(struct btrfs_root *root)
-- 
2.7.1

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web