mirror of https://github.com/vitalif/e2fsprogs
Merge branch 'maint' into next
commit
75405ffde6
|
@ -65,7 +65,7 @@ int e2p_string2mntopt(char *string, unsigned int *mask)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (strncasecmp(string, "MNTOPT_", 8))
|
if (strncasecmp(string, "MNTOPT_", 7))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
if (string[8] == 0)
|
if (string[8] == 0)
|
||||||
|
|
|
@ -108,6 +108,18 @@
|
||||||
(s)->s_log_cluster_size)
|
(s)->s_log_cluster_size)
|
||||||
#define EXT2_CLUSTER_SIZE_BITS(s) ((s)->s_log_cluster_size + 10)
|
#define EXT2_CLUSTER_SIZE_BITS(s) ((s)->s_log_cluster_size + 10)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Macro-instructions used to manage fragments
|
||||||
|
*
|
||||||
|
* Note: for backwards compatibility only, for the dump program.
|
||||||
|
* Ext2/3/4 will never support fragments....
|
||||||
|
*/
|
||||||
|
#define EXT2_MIN_FRAG_SIZE EXT2_MIN_BLOCK_SIZE
|
||||||
|
#define EXT2_MAX_FRAG_SIZE EXT2_MAX_BLOCK_SIZE
|
||||||
|
#define EXT2_MIN_FRAG_LOG_SIZE EXT2_MIN_BLOCK_LOG_SIZE
|
||||||
|
#define EXT2_FRAG_SIZE(s) EXT2_BLOCK_SIZE(s)
|
||||||
|
#define EXT2_FRAGS_PER_BLOCK(s) 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ACL structures
|
* ACL structures
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -217,7 +217,7 @@ struct struct_ext2_filsys {
|
||||||
char * device_name;
|
char * device_name;
|
||||||
struct ext2_super_block * super;
|
struct ext2_super_block * super;
|
||||||
unsigned int blocksize;
|
unsigned int blocksize;
|
||||||
int cluster_ratio_bits;
|
int fragsize;
|
||||||
dgrp_t group_desc_count;
|
dgrp_t group_desc_count;
|
||||||
unsigned long desc_blocks;
|
unsigned long desc_blocks;
|
||||||
struct opaque_ext2_group_desc * group_desc;
|
struct opaque_ext2_group_desc * group_desc;
|
||||||
|
@ -239,10 +239,11 @@ struct struct_ext2_filsys {
|
||||||
struct ext2_image_hdr * image_header;
|
struct ext2_image_hdr * image_header;
|
||||||
__u32 umask;
|
__u32 umask;
|
||||||
time_t now;
|
time_t now;
|
||||||
|
int cluster_ratio_bits;
|
||||||
/*
|
/*
|
||||||
* Reserved for future expansion
|
* Reserved for future expansion
|
||||||
*/
|
*/
|
||||||
__u32 reserved[7];
|
__u32 reserved[6];
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Reserved for the use of the calling application.
|
* Reserved for the use of the calling application.
|
||||||
|
|
|
@ -196,7 +196,7 @@ errcode_t ext2fs_initialize(const char *name, int flags,
|
||||||
|
|
||||||
super->s_creator_os = CREATOR_OS;
|
super->s_creator_os = CREATOR_OS;
|
||||||
|
|
||||||
fs->blocksize = EXT2_BLOCK_SIZE(super);
|
fs->fragsize = fs->blocksize = EXT2_BLOCK_SIZE(super);
|
||||||
fs->cluster_ratio_bits = super->s_log_cluster_size -
|
fs->cluster_ratio_bits = super->s_log_cluster_size -
|
||||||
super->s_log_block_size;
|
super->s_log_block_size;
|
||||||
|
|
||||||
|
|
|
@ -251,7 +251,7 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
|
||||||
retval = EXT2_ET_CORRUPT_SUPERBLOCK;
|
retval = EXT2_ET_CORRUPT_SUPERBLOCK;
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
fs->blocksize = EXT2_BLOCK_SIZE(fs->super);
|
fs->fragsize = fs->blocksize = EXT2_BLOCK_SIZE(fs->super);
|
||||||
if (EXT2_INODE_SIZE(fs->super) < EXT2_GOOD_OLD_INODE_SIZE) {
|
if (EXT2_INODE_SIZE(fs->super) < EXT2_GOOD_OLD_INODE_SIZE) {
|
||||||
retval = EXT2_ET_CORRUPT_SUPERBLOCK;
|
retval = EXT2_ET_CORRUPT_SUPERBLOCK;
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
|
@ -184,7 +184,8 @@ are specified then all blocks will be tested with one pattern
|
||||||
before proceeding to the next pattern.
|
before proceeding to the next pattern.
|
||||||
.TP
|
.TP
|
||||||
.B \-v
|
.B \-v
|
||||||
Verbose mode.
|
Verbose mode. Will write the number of read errors, write errors and data-
|
||||||
|
corruptions to stderr.
|
||||||
.TP
|
.TP
|
||||||
.B \-w
|
.B \-w
|
||||||
Use write-mode test. With this option,
|
Use write-mode test. With this option,
|
||||||
|
|
|
@ -345,7 +345,8 @@ Create an internal journal (i.e., stored inside the filesystem) of size
|
||||||
megabytes.
|
megabytes.
|
||||||
The size of the journal must be at least 1024 filesystem blocks
|
The size of the journal must be at least 1024 filesystem blocks
|
||||||
(i.e., 1MB if using 1k blocks, 4MB if using 4k blocks, etc.)
|
(i.e., 1MB if using 1k blocks, 4MB if using 4k blocks, etc.)
|
||||||
and may be no more than 102,400 filesystem blocks.
|
and may be no more than 10,240,000 filesystem blocks or half the total
|
||||||
|
file system size (whichever is smaller)
|
||||||
@JDEV@.TP
|
@JDEV@.TP
|
||||||
@JDEV@.BI device= external-journal
|
@JDEV@.BI device= external-journal
|
||||||
@JDEV@Attach the filesystem to the journal block device located on
|
@JDEV@Attach the filesystem to the journal block device located on
|
||||||
|
@ -608,7 +609,7 @@ option is used to explicitly add or remove filesystem options that
|
||||||
should be set in the newly created filesystem, the
|
should be set in the newly created filesystem, the
|
||||||
resulting filesystem may not be supported by the requested
|
resulting filesystem may not be supported by the requested
|
||||||
.IR fs-type .
|
.IR fs-type .
|
||||||
(e.g., "\fBmke2fs \-t ext3 \-O extents /dev/sdXX\fR" will create a
|
(e.g., "\fBmke2fs \-t ext3 \-O extent /dev/sdXX\fR" will create a
|
||||||
filesystem that is not supported by the ext3 implementation as found in
|
filesystem that is not supported by the ext3 implementation as found in
|
||||||
the Linux kernel; and "\fBmke2fs \-t ext3 \-O ^has_journal /dev/hdXX\fR"
|
the Linux kernel; and "\fBmke2fs \-t ext3 \-O ^has_journal /dev/hdXX\fR"
|
||||||
will create a filesystem that does not have a journal and hence will not
|
will create a filesystem that does not have a journal and hence will not
|
||||||
|
|
Loading…
Reference in New Issue