commit 6993f853d1e5a5eb6049ceebb1ca052a69368812
Author: Erez Zadok <[EMAIL PROTECTED]>
Date: Sat Sep 29 01:36:57 2007 -0400
Unionfs: coding style: avoid multiple assignments on same line
Signed-off-by: Erez Zadok <[EMAIL PROTECTED]>
diff --git a/fs/unionfs/mmap.c b/fs/unionfs/mmap.c
index 19ba9f4..4ac5a8a 100644
--- a/fs/unionfs/mmap.c
+++ b/fs/unionfs/mmap.c
@@ -175,7 +175,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 70b545f..251a8c3 100644
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -475,13 +475,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;
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
