just whitespace
This commit is contained in:
@ -1,8 +1,8 @@
|
||||
/*
|
||||
* openfs.c --- open an ext2 filesystem
|
||||
*
|
||||
*
|
||||
* Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
|
||||
*
|
||||
*
|
||||
* %Begin-Header%
|
||||
* This file may be redistributed under the terms of the GNU Public
|
||||
* License.
|
||||
@ -42,7 +42,7 @@ blk_t ext2fs_descriptor_block_loc(ext2_filsys fs, blk_t group_block, dgrp_t i)
|
||||
bg = (fs->blocksize / sizeof (struct ext2_group_desc)) * i;
|
||||
if (ext2fs_bg_has_super(fs, bg))
|
||||
has_super = 1;
|
||||
ret_blk = (fs->super->s_first_data_block + has_super +
|
||||
ret_blk = (fs->super->s_first_data_block + has_super +
|
||||
(bg * fs->super->s_blocks_per_group));
|
||||
/*
|
||||
* If group_block is not the normal value, we're trying to use
|
||||
@ -60,27 +60,27 @@ blk_t ext2fs_descriptor_block_loc(ext2_filsys fs, blk_t group_block, dgrp_t i)
|
||||
}
|
||||
|
||||
errcode_t ext2fs_open(const char *name, int flags, int superblock,
|
||||
unsigned int block_size, io_manager manager,
|
||||
unsigned int block_size, io_manager manager,
|
||||
ext2_filsys *ret_fs)
|
||||
{
|
||||
return ext2fs_open2(name, 0, flags, superblock, block_size,
|
||||
return ext2fs_open2(name, 0, flags, superblock, block_size,
|
||||
manager, ret_fs);
|
||||
}
|
||||
|
||||
/*
|
||||
* Note: if superblock is non-zero, block-size must also be non-zero.
|
||||
* Superblock and block_size can be zero to use the default size.
|
||||
* Superblock and block_size can be zero to use the default size.
|
||||
*
|
||||
* Valid flags for ext2fs_open()
|
||||
*
|
||||
* EXT2_FLAG_RW - Open the filesystem for read/write.
|
||||
* EXT2_FLAG_FORCE - Open the filesystem even if some of the
|
||||
*
|
||||
* EXT2_FLAG_RW - Open the filesystem for read/write.
|
||||
* EXT2_FLAG_FORCE - Open the filesystem even if some of the
|
||||
* features aren't supported.
|
||||
* EXT2_FLAG_JOURNAL_DEV_OK - Open an ext3 journal device
|
||||
*/
|
||||
errcode_t ext2fs_open2(const char *name, const char *io_options,
|
||||
int flags, int superblock,
|
||||
unsigned int block_size, io_manager manager,
|
||||
unsigned int block_size, io_manager manager,
|
||||
ext2_filsys *ret_fs)
|
||||
{
|
||||
ext2_filsys fs;
|
||||
@ -93,13 +93,13 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
|
||||
int j;
|
||||
struct ext2_group_desc *gdp;
|
||||
#endif
|
||||
|
||||
|
||||
EXT2_CHECK_MAGIC(manager, EXT2_ET_MAGIC_IO_MANAGER);
|
||||
|
||||
retval = ext2fs_get_mem(sizeof(struct struct_ext2_filsys), &fs);
|
||||
if (retval)
|
||||
return retval;
|
||||
|
||||
|
||||
memset(fs, 0, sizeof(struct struct_ext2_filsys));
|
||||
fs->magic = EXT2_ET_MAGIC_EXT2FS_FILSYS;
|
||||
fs->flags = flags;
|
||||
@ -113,13 +113,13 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
|
||||
*cp++ = 0;
|
||||
io_options = cp;
|
||||
}
|
||||
|
||||
retval = manager->open(fs->device_name,
|
||||
|
||||
retval = manager->open(fs->device_name,
|
||||
(flags & EXT2_FLAG_RW) ? IO_FLAG_RW : 0,
|
||||
&fs->io);
|
||||
if (retval)
|
||||
goto cleanup;
|
||||
if (io_options &&
|
||||
if (io_options &&
|
||||
(retval = io_channel_set_options(fs->io, io_options)))
|
||||
goto cleanup;
|
||||
fs->image_io = fs->io;
|
||||
@ -183,7 +183,7 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
|
||||
ext2fs_swap_super(fs->super);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
if (fs->super->s_magic != EXT2_SUPER_MAGIC) {
|
||||
retval = EXT2_ET_BAD_MAGIC;
|
||||
goto cleanup;
|
||||
@ -215,7 +215,7 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
|
||||
goto cleanup;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
fs->blocksize = EXT2_BLOCK_SIZE(fs->super);
|
||||
if (fs->blocksize == 0) {
|
||||
retval = EXT2_ET_CORRUPT_SUPERBLOCK;
|
||||
@ -247,7 +247,7 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
|
||||
*ret_fs = fs;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Read group descriptors
|
||||
*/
|
||||
@ -296,7 +296,7 @@ cleanup:
|
||||
|
||||
/*
|
||||
* Set/get the filesystem data I/O channel.
|
||||
*
|
||||
*
|
||||
* These functions are only valid if EXT2_FLAG_IMAGE_FILE is true.
|
||||
*/
|
||||
errcode_t ext2fs_get_data_io(ext2_filsys fs, io_channel *old_io)
|
||||
@ -322,7 +322,7 @@ errcode_t ext2fs_rewrite_to_io(ext2_filsys fs, io_channel new_io)
|
||||
if ((fs->flags & EXT2_FLAG_IMAGE_FILE) == 0)
|
||||
return EXT2_ET_NOT_IMAGE_FILE;
|
||||
fs->io = fs->image_io = new_io;
|
||||
fs->flags |= EXT2_FLAG_DIRTY | EXT2_FLAG_RW |
|
||||
fs->flags |= EXT2_FLAG_DIRTY | EXT2_FLAG_RW |
|
||||
EXT2_FLAG_BB_DIRTY | EXT2_FLAG_IB_DIRTY;
|
||||
fs->flags &= ~EXT2_FLAG_IMAGE_FILE;
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user