search for: s_inode_size

...nsertions(+), 1 deletion(-) diff --git a/core/fs/ext2/ext2.c b/core/fs/ext2/ext2.c index df0856f..76bd1d5 100644 --- a/core/fs/ext2/ext2.c +++ b/core/fs/ext2/ext2.c @@ -312,6 +312,9 @@ static int ext2_fs_init(struct fs_info *fs) sbi->s_first_data_block = sb.s_first_data_block; sbi->s_inode_size = sb.s_inode_size; + /* Volume UUID */ + memcpy(sbi->s_uuid, sb.s_uuid, sizeof(sbi->s_uuid)); + /* Initialize the cache, and force block zero to all zero */ cache_init(fs->fs_dev, fs->block_shift); cs = _get_cache_block(fs->fs_dev, 0); @@ -321,6 +324,41 @@ stat...

A while back, I submitted a patch for PR kern/124621, which allows the mounting of an ext2(3) filesystem created with an inode size other than 128. The e2fsprogs' default is now 256, so file systems created on newer Linux distributions or with the port will not be mountable. I was hopeful this would get committed in time for 7.1-RELEASE (and 6.4-RELEASE), however the PR remains open. If

...fs/ext2/ext2.c @@ -139,6 +139,8 @@ ext2_get_inode(struct fs_info *fs, int inr) block_off = inode_offset % EXT2_INODES_PER_BLOCK(fs); data = get_cache(fs->fs_dev, block_num); + if (!data) + return NULL; return (const struct ext2_inode *) (data + block_off * EXT2_SB(fs)->s_inode_size); @@ -164,7 +166,7 @@ static struct inode *ext2_iget_by_inr(struct fs_info *fs, uint32_t inr) struct inode *inode; e_inode = ext2_get_inode(fs, inr); - if (!(inode = alloc_inode(fs, inr, sizeof(struct ext2_pvt_inode)))) + if (!e_inode || !(inode = alloc_inode(fs, inr, sizeof(struc...

...+ + __le32 s_checkinterval; /* max. time between checks */ + __le32 s_creator_os; /* OS */ + __le16 s_def_resuid; /* Default uid for reserved blocks */ + __le16 s_def_resgid; /* Default gid for reserved blocks */ + __le32 s_first_ino; /* First non-reserved inode */ /* or __le16 */ + + __le16 s_inode_size; /* Size of an inode */ + __le16 s_dat_entry_size; /* Size of a dat entry */ + __le16 s_checkpoint_size; /* Size of a checkpoint */ + __le16 s_segment_usage_size; /* Size of a segment usage */ + + __u8 s_uuid[16]; /* 128-bit uuid for volume */ + char s_volume_name[16]; /* volume na...

.../ EXT2_BLOCKS_PER_GROUP(fs); diff --git a/core/fs/ext2/ext2_fs.h b/core/fs/ext2/ext2_fs.h index 803a9954..d8d07ebd 100644 --- a/core/fs/ext2/ext2_fs.h +++ b/core/fs/ext2/ext2_fs.h @@ -278,6 +278,7 @@ struct ext2_sb_info { uint32_t s_first_data_block; /* First Data Block */ int s_inode_size; uint8_t s_uuid[16]; /* 128-bit uuid for volume */ + int s_desc_size; /* size of group descriptor */ }; static inline struct ext2_sb_info *EXT2_SB(struct fs_info *fs) -- 2.11.0

...; @@ -66,7 +67,6 @@ static inline bool ext2_match_entry(const char *name, size_t len, return !memcmp(name, de->d_name, len); } - /* * p is at least 6 bytes before the end of page */ @@ -144,7 +144,7 @@ ext2_get_inode(struct fs_info *fs, int inr) (data + block_off * EXT2_SB(fs)->s_inode_size); } -static void fill_inode(struct inode *inode, const struct ext2_inode *e_inode) +static void fill_inode(struct inode *inode, const struct ext2_inode *e_inode, uint32_t inr) { inode->mode = IFTODT(e_inode->i_mode); inode->size = e_inode->i_size; @@ -156,6 +156,7 @@...

hello hpa, nothing particular stands out, just syncing with latest Debian upload and subsequent patch emails. please review merge or nack. thanks :) maks git pull git://git.debian.org/~maks/klibc.git maks for the changes: Aaron Griffin (1): [klibc] kinit: skip md assembly if mdX exists Colin Watson (1): [klibc] mount/umount FUSE support Harald Jenny (1): [klibc] fstype: