Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a374a48f authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml ubd code: fix a bit of whitespace 



Correct a bit of whitespace problems while working here.

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4833aff7

arch/um/drivers/ubd_kern.c

+17 −14
Original line number Diff line number Diff line
@@ -1198,11 +1198,12 @@ int open_ubd_file(char *file, struct openflags *openflags, 
		if ((fd == -ENOENT) && (create_cow_out != NULL))

			*create_cow_out = 1;

                if (!openflags->w ||

                   ((fd != -EROFS) && (fd != -EACCES))) return(fd);

                   ((fd != -EROFS) && (fd != -EACCES)))

			return fd;

		openflags->w = 0;

		fd = os_open_file(file, *openflags, mode);

		if (fd < 0)

			return(fd);

			return fd;

        }



	err = os_lock_file(fd, openflags->w);
@@ -1212,7 +1213,8 @@ int open_ubd_file(char *file, struct openflags *openflags, 
	}



	/* Succesful return case! */

	if(backing_file_out == NULL) return(fd);

	if(backing_file_out == NULL)

		return(fd);



	err = read_cow_header(file_reader, &fd, &version, &backing_file, &mtime,

			      &size, &sectorsize, &align, bitmap_offset_out);
@@ -1221,7 +1223,8 @@ int open_ubd_file(char *file, struct openflags *openflags, 
		       "errno = %d\n", file, -err);

		goto out_close;

	}

	if(err) return(fd);

	if(err)

		return(fd);



	asked_switch = path_requires_switch(*backing_file_out, backing_file, file);
@@ -1234,20 +1237,20 @@ int open_ubd_file(char *file, struct openflags *openflags, 
			printk("Switch failed, errno = %d\n", -err);

			goto out_close;

		}

	}

	else {

	} else {

		*backing_file_out = backing_file;

		err = backing_file_mismatch(*backing_file_out, size, mtime);

		if(err) goto out_close;

		if (err)

			goto out_close;

	}



	cow_sizes(version, size, sectorsize, align, *bitmap_offset_out,

		  bitmap_len_out, data_offset_out);



        return(fd);

        return fd;

 out_close:

	os_close_file(fd);

	return(err);

	return err;

}



int create_cow_file(char *cow_file, char *backing_file, struct openflags flags,