github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-12 16:18:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge patch series "vfs: follow-on fixes for i_ino widening"

Browse Source 
Jeff Layton <jlayton@kernel.org> says:

Just some patches to fix follow-on issues reported after the
inode->i_ino widening series.

* patches from https://patch.msgid.link/20260316-iino-u64-v3-0-d1076b8f7a20@kernel.org:
  nilfs2: fix 64-bit division operations in nilfs_bmap_find_target_in_group()
  EVM: add comment describing why ino field is still unsigned long

Link: https://patch.msgid.link/20260316-iino-u64-v3-0-d1076b8f7a20@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Christian Brauner 2026-03-17 15:38:54 +01:00
commit 2e43ca1a4f
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/nilfs2/bmap.c
View File

@ -450,18 +450,25 @@ __u64 nilfs_bmap_find_target_seq(const struct nilfs_bmap *bmap, __u64 key)
return NILFS_BMAP_INVALID_PTR;
}
#define NILFS_BMAP_GROUP_DIV 8
#define NILFS_BMAP_GROUP_DIV 8 /* must be power of 2 */
__u64 nilfs_bmap_find_target_in_group(const struct nilfs_bmap *bmap)
{
struct inode *dat = nilfs_bmap_get_dat(bmap);
unsigned long entries_per_group = nilfs_palloc_entries_per_group(dat);
unsigned long group = bmap->b_inode->i_ino / entries_per_group;
unsigned long group;
u32 index;
BUILD_BUG_ON_NOT_POWER_OF_2(NILFS_BMAP_GROUP_DIV);
group = div_u64(bmap->b_inode->i_ino, entries_per_group);
index = bmap->b_inode->i_ino & (NILFS_BMAP_GROUP_DIV - 1);
return group * entries_per_group +
(bmap->b_inode->i_ino % NILFS_BMAP_GROUP_DIV) *
(entries_per_group / NILFS_BMAP_GROUP_DIV);
index * (entries_per_group / NILFS_BMAP_GROUP_DIV);
}
static struct lock_class_key nilfs_bmap_dat_lock_key;
static struct lock_class_key nilfs_bmap_mdt_lock_key;

6
security/integrity/evm/evm_crypto.c
View File

@ -144,6 +144,12 @@ static void hmac_add_misc(struct shash_desc *desc, struct inode *inode,
char type, char *digest)
{
struct h_misc {
/*
* Although inode->i_ino is now u64, this field remains
* unsigned long to allow existing HMAC and signatures from
* 32-bit hosts to continue working when i_ino hasn't changed
* and fits in a u32.
*/
unsigned long ino;
__u32 generation;
uid_t uid;