MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-07-05 13:25:20 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'v6.6/standard/base' into v6.6/standard/x86

Browse Source
This commit is contained in:
Bruce Ashfield 2025-06-11 11:20:20 -04:00
commit 8875f25fd7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/aufs/debug.c
View File

@ -112,6 +112,7 @@ static int do_pri_inode(aufs_bindex_t bindex, struct inode *inode, int hn,
{
char *n = NULL;
int l = 0;
struct timespec64 ctime;
if (!inode || IS_ERR(inode)) {
dpri("i%d: err %ld\n", bindex, PTR_ERR(inode));
@ -126,6 +127,7 @@ static int do_pri_inode(aufs_bindex_t bindex, struct inode *inode, int hn,
l = wh->d_name.len;
}
ctime = inode_get_ctime(inode);
dpri("i%d: %p, i%lu, %s, cnt %d, nl %u, 0%o, sz %llu, blk %llu,"
" acl %p, def_acl %p,"
" hn %d, ct %lld, np %lu, st 0x%lx, f 0x%x, v %llu, g %x%s%.*s\n",
@ -134,7 +136,7 @@ static int do_pri_inode(aufs_bindex_t bindex, struct inode *inode, int hn,
atomic_read(&inode->i_count), inode->i_nlink, inode->i_mode,
i_size_read(inode), (unsigned long long)inode->i_blocks,
inode->i_acl, inode->i_default_acl,
hn, (long long)timespec64_to_ns(&inode->i_ctime) & 0x0ffff,
hn, (long long)timespec64_to_ns(&ctime) & 0x0ffff,
inode->i_mapping ? inode->i_mapping->nrpages : 0,
inode->i_state, inode->i_flags, inode_peek_iversion(inode),
inode->i_generation,

2
fs/aufs/sysrq.c
View File

@ -103,7 +103,7 @@ static char *aufs_sysrq_key = "a";
module_param_named(sysrq, aufs_sysrq_key, charp, 0444);
MODULE_PARM_DESC(sysrq, "MagicSysRq key for " AUFS_NAME);
static void au_sysrq(int key __maybe_unused)
static void au_sysrq(u8 key __maybe_unused)
{
struct au_sbinfo *sbinfo;
struct hlist_bl_node *pos;