From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Sat, 29 Sep 2007 05:36:57 +0000 (-0400)
Subject: Unionfs: coding style: avoid multiple assignments on same line
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=f441257759e0a6eda01bd5eaf0c6a7bc3afd4856;p=unionfs-3.4.y.git

Unionfs: coding style: avoid multiple assignments on same line

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
---

diff --git a/fs/unionfs/mmap.c b/fs/unionfs/mmap.c
index ac1a0605c067..644028279fae 100644
--- a/fs/unionfs/mmap.c
+++ b/fs/unionfs/mmap.c
@@ -179,7 +179,8 @@ static int unionfs_do_readpage(struct file *file, struct page *page)
 	 * may be a little slower, but a lot safer, as the VFS does a lot of
 	 * the necessary magic for us.
 	 */
-	offset = lower_file->f_pos = page_offset(page);
+	lower_file->f_pos = page_offset(page);
+	offset = page_offset(page);
 	old_fs = get_fs();
 	set_fs(KERNEL_DS);
 	err = vfs_read(lower_file, page_data, PAGE_CACHE_SIZE,
diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c
index 0da9181a07e5..0a0b075ca108 100644
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -477,13 +477,16 @@ static int unionfs_remount_fs(struct super_block *sb, int *flags,
 	 * "add" and "del" commands.  Copy the "options" string because
 	 * strsep modifies the string and we need it later.
 	 */
-	optionstmp = tmp_to_free = kstrdup(options, GFP_KERNEL);
+	tmp_to_free = kstrdup(options, GFP_KERNEL);
+	optionstmp = tmp_to_free;
 	if (unlikely(!optionstmp)) {
 		err = -ENOMEM;
 		goto out_free;
 	}
-	new_branches = cur_branches = sbmax(sb); /* current no. branches */
-	add_branches = del_branches = 0;
+	cur_branches = sbmax(sb); /* current no. branches */
+	new_branches = sbmax(sb);
+	del_branches = 0;
+	add_branches = 0;
 	new_high_branch_id = sbhbid(sb); /* save current high_branch_id */
 	while ((optname = strsep(&optionstmp, ",")) != NULL) {
 		char *optarg;