mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
treewide: change inode->i_ino from unsigned long to u64
On 32-bit architectures, unsigned long is only 32 bits wide, which causes 64-bit inode numbers to be silently truncated. Several filesystems (NFS, XFS, BTRFS, etc.) can generate inode numbers that exceed 32 bits, and this truncation can lead to inode number collisions and other subtle bugs on 32-bit systems. Change the type of inode->i_ino from unsigned long to u64 to ensure that inode numbers are always represented as 64-bit values regardless of architecture. Update all format specifiers treewide from %lu/%lx to %llu/%llx to match the new type, along with corresponding local variable types. This is the bulk treewide conversion. Earlier patches in this series handled trace events separately to allow trace field reordering for better struct packing on 32-bit. Signed-off-by: Jeff Layton <jlayton@kernel.org> Link: https://patch.msgid.link/20260304-iino-u64-v3-12-2257ad83d372@kernel.org Acked-by: Damien Le Moal <dlemoal@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
@@ -1708,7 +1708,7 @@ static int dma_buf_debug_show(struct seq_file *s, void *unused)
|
||||
|
||||
|
||||
spin_lock(&buf_obj->name_lock);
|
||||
seq_printf(s, "%08zu\t%08x\t%08x\t%08ld\t%s\t%08lu\t%s\n",
|
||||
seq_printf(s, "%08zu\t%08x\t%08x\t%08ld\t%s\t%08llu\t%s\n",
|
||||
buf_obj->size,
|
||||
buf_obj->file->f_flags, buf_obj->file->f_mode,
|
||||
file_count(buf_obj->file),
|
||||
|
||||
@@ -1676,9 +1676,9 @@ u64 amdgpu_bo_print_info(int id, struct amdgpu_bo *bo, struct seq_file *m)
|
||||
attachment = READ_ONCE(bo->tbo.base.import_attach);
|
||||
|
||||
if (attachment)
|
||||
seq_printf(m, " imported from ino:%lu", file_inode(dma_buf->file)->i_ino);
|
||||
seq_printf(m, " imported from ino:%llu", file_inode(dma_buf->file)->i_ino);
|
||||
else if (dma_buf)
|
||||
seq_printf(m, " exported as ino:%lu", file_inode(dma_buf->file)->i_ino);
|
||||
seq_printf(m, " exported as ino:%llu", file_inode(dma_buf->file)->i_ino);
|
||||
|
||||
amdgpu_bo_print_flag(m, bo, CPU_ACCESS_REQUIRED);
|
||||
amdgpu_bo_print_flag(m, bo, NO_CPU_ACCESS);
|
||||
|
||||
+2
-2
@@ -36,7 +36,7 @@ static void v9fs_begin_writeback(struct netfs_io_request *wreq)
|
||||
|
||||
fid = v9fs_fid_find_inode(wreq->inode, true, INVALID_UID, true);
|
||||
if (!fid) {
|
||||
WARN_ONCE(1, "folio expected an open fid inode->i_ino=%lx\n",
|
||||
WARN_ONCE(1, "folio expected an open fid inode->i_ino=%llx\n",
|
||||
wreq->inode->i_ino);
|
||||
return;
|
||||
}
|
||||
@@ -133,7 +133,7 @@ static int v9fs_init_request(struct netfs_io_request *rreq, struct file *file)
|
||||
return 0;
|
||||
|
||||
no_fid:
|
||||
WARN_ONCE(1, "folio expected an open fid inode->i_ino=%lx\n",
|
||||
WARN_ONCE(1, "folio expected an open fid inode->i_ino=%llx\n",
|
||||
rreq->inode->i_ino);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
+3
-3
@@ -1245,7 +1245,7 @@ static int
|
||||
v9fs_vfs_symlink(struct mnt_idmap *idmap, struct inode *dir,
|
||||
struct dentry *dentry, const char *symname)
|
||||
{
|
||||
p9_debug(P9_DEBUG_VFS, " %lu,%pd,%s\n",
|
||||
p9_debug(P9_DEBUG_VFS, " %llu,%pd,%s\n",
|
||||
dir->i_ino, dentry, symname);
|
||||
|
||||
return v9fs_vfs_mkspecial(dir, dentry, P9_DMSYMLINK, symname);
|
||||
@@ -1269,7 +1269,7 @@ v9fs_vfs_link(struct dentry *old_dentry, struct inode *dir,
|
||||
char name[1 + U32_MAX_DIGITS + 2]; /* sign + number + \n + \0 */
|
||||
struct p9_fid *oldfid;
|
||||
|
||||
p9_debug(P9_DEBUG_VFS, " %lu,%pd,%pd\n",
|
||||
p9_debug(P9_DEBUG_VFS, " %llu,%pd,%pd\n",
|
||||
dir->i_ino, dentry, old_dentry);
|
||||
|
||||
oldfid = v9fs_fid_clone(old_dentry);
|
||||
@@ -1305,7 +1305,7 @@ v9fs_vfs_mknod(struct mnt_idmap *idmap, struct inode *dir,
|
||||
char name[2 + U32_MAX_DIGITS + 1 + U32_MAX_DIGITS + 1];
|
||||
u32 perm;
|
||||
|
||||
p9_debug(P9_DEBUG_VFS, " %lu,%pd mode: %x MAJOR: %u MINOR: %u\n",
|
||||
p9_debug(P9_DEBUG_VFS, " %llu,%pd mode: %x MAJOR: %u MINOR: %u\n",
|
||||
dir->i_ino, dentry, mode,
|
||||
MAJOR(rdev), MINOR(rdev));
|
||||
|
||||
|
||||
@@ -691,7 +691,7 @@ v9fs_vfs_symlink_dotl(struct mnt_idmap *idmap, struct inode *dir,
|
||||
struct p9_fid *fid = NULL;
|
||||
|
||||
name = dentry->d_name.name;
|
||||
p9_debug(P9_DEBUG_VFS, "%lu,%s,%s\n", dir->i_ino, name, symname);
|
||||
p9_debug(P9_DEBUG_VFS, "%llu,%s,%s\n", dir->i_ino, name, symname);
|
||||
|
||||
dfid = v9fs_parent_fid(dentry);
|
||||
if (IS_ERR(dfid)) {
|
||||
@@ -734,7 +734,7 @@ v9fs_vfs_link_dotl(struct dentry *old_dentry, struct inode *dir,
|
||||
struct p9_fid *dfid, *oldfid;
|
||||
struct v9fs_session_info *v9ses;
|
||||
|
||||
p9_debug(P9_DEBUG_VFS, "dir ino: %lu, old_name: %pd, new_name: %pd\n",
|
||||
p9_debug(P9_DEBUG_VFS, "dir ino: %llu, old_name: %pd, new_name: %pd\n",
|
||||
dir->i_ino, old_dentry, dentry);
|
||||
|
||||
v9ses = v9fs_inode2v9ses(dir);
|
||||
@@ -798,7 +798,7 @@ v9fs_vfs_mknod_dotl(struct mnt_idmap *idmap, struct inode *dir,
|
||||
struct p9_qid qid;
|
||||
struct posix_acl *dacl = NULL, *pacl = NULL;
|
||||
|
||||
p9_debug(P9_DEBUG_VFS, " %lu,%pd mode: %x MAJOR: %u MINOR: %u\n",
|
||||
p9_debug(P9_DEBUG_VFS, " %llu,%pd mode: %x MAJOR: %u MINOR: %u\n",
|
||||
dir->i_ino, dentry, omode,
|
||||
MAJOR(rdev), MINOR(rdev));
|
||||
|
||||
|
||||
+5
-5
@@ -33,7 +33,7 @@ affs_insert_hash(struct inode *dir, struct buffer_head *bh)
|
||||
ino = bh->b_blocknr;
|
||||
offset = affs_hash_name(sb, AFFS_TAIL(sb, bh)->name + 1, AFFS_TAIL(sb, bh)->name[0]);
|
||||
|
||||
pr_debug("%s(dir=%lu, ino=%d)\n", __func__, dir->i_ino, ino);
|
||||
pr_debug("%s(dir=%llu, ino=%d)\n", __func__, dir->i_ino, ino);
|
||||
|
||||
dir_bh = affs_bread(sb, dir->i_ino);
|
||||
if (!dir_bh)
|
||||
@@ -83,7 +83,7 @@ affs_remove_hash(struct inode *dir, struct buffer_head *rem_bh)
|
||||
sb = dir->i_sb;
|
||||
rem_ino = rem_bh->b_blocknr;
|
||||
offset = affs_hash_name(sb, AFFS_TAIL(sb, rem_bh)->name+1, AFFS_TAIL(sb, rem_bh)->name[0]);
|
||||
pr_debug("%s(dir=%lu, ino=%d, hashval=%d)\n", __func__, dir->i_ino,
|
||||
pr_debug("%s(dir=%llu, ino=%d, hashval=%d)\n", __func__, dir->i_ino,
|
||||
rem_ino, offset);
|
||||
|
||||
bh = affs_bread(sb, dir->i_ino);
|
||||
@@ -128,7 +128,7 @@ affs_fix_dcache(struct inode *inode, u32 entry_ino)
|
||||
spin_lock(&inode->i_lock);
|
||||
hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
|
||||
if (entry_ino == (u32)(long)dentry->d_fsdata) {
|
||||
dentry->d_fsdata = (void *)inode->i_ino;
|
||||
dentry->d_fsdata = (void *)(unsigned long)inode->i_ino;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -147,7 +147,7 @@ affs_remove_link(struct dentry *dentry)
|
||||
u32 link_ino, ino;
|
||||
int retval;
|
||||
|
||||
pr_debug("%s(key=%ld)\n", __func__, inode->i_ino);
|
||||
pr_debug("%s(key=%llu)\n", __func__, inode->i_ino);
|
||||
retval = -EIO;
|
||||
bh = affs_bread(sb, inode->i_ino);
|
||||
if (!bh)
|
||||
@@ -279,7 +279,7 @@ affs_remove_header(struct dentry *dentry)
|
||||
if (!inode)
|
||||
goto done;
|
||||
|
||||
pr_debug("%s(key=%ld)\n", __func__, inode->i_ino);
|
||||
pr_debug("%s(key=%llu)\n", __func__, inode->i_ino);
|
||||
retval = -EIO;
|
||||
bh = affs_bread(sb, (u32)(long)dentry->d_fsdata);
|
||||
if (!bh)
|
||||
|
||||
+1
-1
@@ -125,7 +125,7 @@ affs_alloc_block(struct inode *inode, u32 goal)
|
||||
sb = inode->i_sb;
|
||||
sbi = AFFS_SB(sb);
|
||||
|
||||
pr_debug("balloc(inode=%lu,goal=%u): ", inode->i_ino, goal);
|
||||
pr_debug("balloc(inode=%llu,goal=%u): ", inode->i_ino, goal);
|
||||
|
||||
if (AFFS_I(inode)->i_pa_cnt) {
|
||||
pr_debug("%d\n", AFFS_I(inode)->i_lastalloc+1);
|
||||
|
||||
+1
-1
@@ -90,7 +90,7 @@ affs_readdir(struct file *file, struct dir_context *ctx)
|
||||
u32 ino;
|
||||
int error = 0;
|
||||
|
||||
pr_debug("%s(ino=%lu,f_pos=%llx)\n", __func__, inode->i_ino, ctx->pos);
|
||||
pr_debug("%s(ino=%llu,f_pos=%llx)\n", __func__, inode->i_ino, ctx->pos);
|
||||
|
||||
if (ctx->pos < 2) {
|
||||
data->ino = 0;
|
||||
|
||||
+10
-10
@@ -24,7 +24,7 @@ static struct buffer_head *affs_get_extblock_slow(struct inode *inode, u32 ext);
|
||||
static int
|
||||
affs_file_open(struct inode *inode, struct file *filp)
|
||||
{
|
||||
pr_debug("open(%lu,%d)\n",
|
||||
pr_debug("open(%llu,%d)\n",
|
||||
inode->i_ino, atomic_read(&AFFS_I(inode)->i_opencnt));
|
||||
atomic_inc(&AFFS_I(inode)->i_opencnt);
|
||||
return 0;
|
||||
@@ -33,7 +33,7 @@ affs_file_open(struct inode *inode, struct file *filp)
|
||||
static int
|
||||
affs_file_release(struct inode *inode, struct file *filp)
|
||||
{
|
||||
pr_debug("release(%lu, %d)\n",
|
||||
pr_debug("release(%llu, %d)\n",
|
||||
inode->i_ino, atomic_read(&AFFS_I(inode)->i_opencnt));
|
||||
|
||||
if (atomic_dec_and_test(&AFFS_I(inode)->i_opencnt)) {
|
||||
@@ -301,7 +301,7 @@ affs_get_block(struct inode *inode, sector_t block, struct buffer_head *bh_resul
|
||||
struct buffer_head *ext_bh;
|
||||
u32 ext;
|
||||
|
||||
pr_debug("%s(%lu, %llu)\n", __func__, inode->i_ino,
|
||||
pr_debug("%s(%llu, %llu)\n", __func__, inode->i_ino,
|
||||
(unsigned long long)block);
|
||||
|
||||
BUG_ON(block > (sector_t)0x7fffffffUL);
|
||||
@@ -534,7 +534,7 @@ static int affs_do_read_folio_ofs(struct folio *folio, size_t to, int create)
|
||||
size_t bidx, boff, bsize;
|
||||
u32 tmp;
|
||||
|
||||
pr_debug("%s(%lu, %ld, 0, %zu)\n", __func__, inode->i_ino,
|
||||
pr_debug("%s(%llu, %ld, 0, %zu)\n", __func__, inode->i_ino,
|
||||
folio->index, to);
|
||||
BUG_ON(to > folio_size(folio));
|
||||
bsize = AFFS_SB(sb)->s_data_blksize;
|
||||
@@ -566,7 +566,7 @@ affs_extent_file_ofs(struct inode *inode, u32 newsize)
|
||||
u32 size, bsize;
|
||||
u32 tmp;
|
||||
|
||||
pr_debug("%s(%lu, %d)\n", __func__, inode->i_ino, newsize);
|
||||
pr_debug("%s(%llu, %d)\n", __func__, inode->i_ino, newsize);
|
||||
bsize = AFFS_SB(sb)->s_data_blksize;
|
||||
bh = NULL;
|
||||
size = AFFS_I(inode)->mmu_private;
|
||||
@@ -634,7 +634,7 @@ static int affs_read_folio_ofs(struct file *file, struct folio *folio)
|
||||
size_t to;
|
||||
int err;
|
||||
|
||||
pr_debug("%s(%lu, %ld)\n", __func__, inode->i_ino, folio->index);
|
||||
pr_debug("%s(%llu, %ld)\n", __func__, inode->i_ino, folio->index);
|
||||
to = folio_size(folio);
|
||||
if (folio_pos(folio) + to > inode->i_size) {
|
||||
to = inode->i_size - folio_pos(folio);
|
||||
@@ -658,7 +658,7 @@ static int affs_write_begin_ofs(const struct kiocb *iocb,
|
||||
pgoff_t index;
|
||||
int err = 0;
|
||||
|
||||
pr_debug("%s(%lu, %llu, %llu)\n", __func__, inode->i_ino, pos,
|
||||
pr_debug("%s(%llu, %llu, %llu)\n", __func__, inode->i_ino, pos,
|
||||
pos + len);
|
||||
if (pos > AFFS_I(inode)->mmu_private) {
|
||||
/* XXX: this probably leaves a too-big i_size in case of
|
||||
@@ -710,7 +710,7 @@ static int affs_write_end_ofs(const struct kiocb *iocb,
|
||||
* due to write_begin.
|
||||
*/
|
||||
|
||||
pr_debug("%s(%lu, %llu, %llu)\n", __func__, inode->i_ino, pos,
|
||||
pr_debug("%s(%llu, %llu, %llu)\n", __func__, inode->i_ino, pos,
|
||||
pos + len);
|
||||
bsize = AFFS_SB(sb)->s_data_blksize;
|
||||
data = folio_address(folio);
|
||||
@@ -854,7 +854,7 @@ affs_free_prealloc(struct inode *inode)
|
||||
{
|
||||
struct super_block *sb = inode->i_sb;
|
||||
|
||||
pr_debug("free_prealloc(ino=%lu)\n", inode->i_ino);
|
||||
pr_debug("free_prealloc(ino=%llu)\n", inode->i_ino);
|
||||
|
||||
while (AFFS_I(inode)->i_pa_cnt) {
|
||||
AFFS_I(inode)->i_pa_cnt--;
|
||||
@@ -874,7 +874,7 @@ affs_truncate(struct inode *inode)
|
||||
struct buffer_head *ext_bh;
|
||||
int i;
|
||||
|
||||
pr_debug("truncate(inode=%lu, oldsize=%llu, newsize=%llu)\n",
|
||||
pr_debug("truncate(inode=%llu, oldsize=%llu, newsize=%llu)\n",
|
||||
inode->i_ino, AFFS_I(inode)->mmu_private, inode->i_size);
|
||||
|
||||
last_blk = 0;
|
||||
|
||||
+6
-6
@@ -32,7 +32,7 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino)
|
||||
if (!(inode_state_read_once(inode) & I_NEW))
|
||||
return inode;
|
||||
|
||||
pr_debug("affs_iget(%lu)\n", inode->i_ino);
|
||||
pr_debug("affs_iget(%llu)\n", inode->i_ino);
|
||||
|
||||
block = inode->i_ino;
|
||||
bh = affs_bread(sb, block);
|
||||
@@ -171,14 +171,14 @@ affs_write_inode(struct inode *inode, struct writeback_control *wbc)
|
||||
uid_t uid;
|
||||
gid_t gid;
|
||||
|
||||
pr_debug("write_inode(%lu)\n", inode->i_ino);
|
||||
pr_debug("write_inode(%llu)\n", inode->i_ino);
|
||||
|
||||
if (!inode->i_nlink)
|
||||
// possibly free block
|
||||
return 0;
|
||||
bh = affs_bread(sb, inode->i_ino);
|
||||
if (!bh) {
|
||||
affs_error(sb,"write_inode","Cannot read block %lu",inode->i_ino);
|
||||
affs_error(sb, "write_inode", "Cannot read block %llu", inode->i_ino);
|
||||
return -EIO;
|
||||
}
|
||||
tail = AFFS_TAIL(sb, bh);
|
||||
@@ -219,7 +219,7 @@ affs_notify_change(struct mnt_idmap *idmap, struct dentry *dentry,
|
||||
struct inode *inode = d_inode(dentry);
|
||||
int error;
|
||||
|
||||
pr_debug("notify_change(%lu,0x%x)\n", inode->i_ino, attr->ia_valid);
|
||||
pr_debug("notify_change(%llu,0x%x)\n", inode->i_ino, attr->ia_valid);
|
||||
|
||||
error = setattr_prepare(&nop_mnt_idmap, dentry, attr);
|
||||
if (error)
|
||||
@@ -260,7 +260,7 @@ void
|
||||
affs_evict_inode(struct inode *inode)
|
||||
{
|
||||
unsigned long cache_page;
|
||||
pr_debug("evict_inode(ino=%lu, nlink=%u)\n",
|
||||
pr_debug("evict_inode(ino=%llu, nlink=%u)\n",
|
||||
inode->i_ino, inode->i_nlink);
|
||||
truncate_inode_pages_final(&inode->i_data);
|
||||
|
||||
@@ -353,7 +353,7 @@ affs_add_entry(struct inode *dir, struct inode *inode, struct dentry *dentry, s3
|
||||
u32 block = 0;
|
||||
int retval;
|
||||
|
||||
pr_debug("%s(dir=%lu, inode=%lu, \"%pd\", type=%d)\n", __func__,
|
||||
pr_debug("%s(dir=%llu, inode=%llu, \"%pd\", type=%d)\n", __func__,
|
||||
dir->i_ino, inode->i_ino, dentry, type);
|
||||
|
||||
retval = -EIO;
|
||||
|
||||
+7
-7
@@ -235,7 +235,7 @@ affs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
|
||||
int
|
||||
affs_unlink(struct inode *dir, struct dentry *dentry)
|
||||
{
|
||||
pr_debug("%s(dir=%lu, %lu \"%pd\")\n", __func__, dir->i_ino,
|
||||
pr_debug("%s(dir=%llu, %llu \"%pd\")\n", __func__, dir->i_ino,
|
||||
d_inode(dentry)->i_ino, dentry);
|
||||
|
||||
return affs_remove_header(dentry);
|
||||
@@ -249,7 +249,7 @@ affs_create(struct mnt_idmap *idmap, struct inode *dir,
|
||||
struct inode *inode;
|
||||
int error;
|
||||
|
||||
pr_debug("%s(%lu,\"%pd\",0%ho)\n",
|
||||
pr_debug("%s(%llu,\"%pd\",0%ho)\n",
|
||||
__func__, dir->i_ino, dentry, mode);
|
||||
|
||||
inode = affs_new_inode(dir);
|
||||
@@ -280,7 +280,7 @@ affs_mkdir(struct mnt_idmap *idmap, struct inode *dir,
|
||||
struct inode *inode;
|
||||
int error;
|
||||
|
||||
pr_debug("%s(%lu,\"%pd\",0%ho)\n",
|
||||
pr_debug("%s(%llu,\"%pd\",0%ho)\n",
|
||||
__func__, dir->i_ino, dentry, mode);
|
||||
|
||||
inode = affs_new_inode(dir);
|
||||
@@ -306,7 +306,7 @@ affs_mkdir(struct mnt_idmap *idmap, struct inode *dir,
|
||||
int
|
||||
affs_rmdir(struct inode *dir, struct dentry *dentry)
|
||||
{
|
||||
pr_debug("%s(dir=%lu, %lu \"%pd\")\n", __func__, dir->i_ino,
|
||||
pr_debug("%s(dir=%llu, %llu \"%pd\")\n", __func__, dir->i_ino,
|
||||
d_inode(dentry)->i_ino, dentry);
|
||||
|
||||
return affs_remove_header(dentry);
|
||||
@@ -323,7 +323,7 @@ affs_symlink(struct mnt_idmap *idmap, struct inode *dir,
|
||||
int i, maxlen, error;
|
||||
char c, lc;
|
||||
|
||||
pr_debug("%s(%lu,\"%pd\" -> \"%s\")\n",
|
||||
pr_debug("%s(%llu,\"%pd\" -> \"%s\")\n",
|
||||
__func__, dir->i_ino, dentry, symname);
|
||||
|
||||
maxlen = AFFS_SB(sb)->s_hashsize * sizeof(u32) - 1;
|
||||
@@ -395,7 +395,7 @@ affs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
|
||||
{
|
||||
struct inode *inode = d_inode(old_dentry);
|
||||
|
||||
pr_debug("%s(%lu, %lu, \"%pd\")\n", __func__, inode->i_ino, dir->i_ino,
|
||||
pr_debug("%s(%llu, %llu, \"%pd\")\n", __func__, inode->i_ino, dir->i_ino,
|
||||
dentry);
|
||||
|
||||
return affs_add_entry(dir, inode, dentry, ST_LINKFILE);
|
||||
@@ -511,7 +511,7 @@ int affs_rename2(struct mnt_idmap *idmap, struct inode *old_dir,
|
||||
if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE))
|
||||
return -EINVAL;
|
||||
|
||||
pr_debug("%s(old=%lu,\"%pd\" to new=%lu,\"%pd\")\n", __func__,
|
||||
pr_debug("%s(old=%llu,\"%pd\" to new=%llu,\"%pd\")\n", __func__,
|
||||
old_dir->i_ino, old_dentry, new_dir->i_ino, new_dentry);
|
||||
|
||||
if (flags & RENAME_EXCHANGE)
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ static int affs_symlink_read_folio(struct file *file, struct folio *folio)
|
||||
char c;
|
||||
char lc;
|
||||
|
||||
pr_debug("get_link(ino=%lu)\n", inode->i_ino);
|
||||
pr_debug("get_link(ino=%llu)\n", inode->i_ino);
|
||||
|
||||
bh = affs_bread(inode->i_sb, inode->i_ino);
|
||||
if (!bh)
|
||||
|
||||
+5
-5
@@ -148,7 +148,7 @@ static bool afs_dir_check_block(struct afs_vnode *dvnode, size_t progress,
|
||||
union afs_xdr_dir_block *block)
|
||||
{
|
||||
if (block->hdr.magic != AFS_DIR_MAGIC) {
|
||||
pr_warn("%s(%lx): [%zx] bad magic %04x\n",
|
||||
pr_warn("%s(%llx): [%zx] bad magic %04x\n",
|
||||
__func__, dvnode->netfs.inode.i_ino,
|
||||
progress, ntohs(block->hdr.magic));
|
||||
trace_afs_dir_check_failed(dvnode, progress);
|
||||
@@ -214,7 +214,7 @@ static int afs_dir_check(struct afs_vnode *dvnode)
|
||||
*/
|
||||
static int afs_dir_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
_enter("{%lu}", inode->i_ino);
|
||||
_enter("{%llu}", inode->i_ino);
|
||||
|
||||
BUILD_BUG_ON(sizeof(union afs_xdr_dir_block) != 2048);
|
||||
BUILD_BUG_ON(sizeof(union afs_xdr_dirent) != 32);
|
||||
@@ -523,7 +523,7 @@ static int afs_dir_iterate(struct inode *dir, struct dir_context *ctx,
|
||||
int retry_limit = 100;
|
||||
int ret;
|
||||
|
||||
_enter("{%lu},%llx,,", dir->i_ino, ctx->pos);
|
||||
_enter("{%llu},%llx,,", dir->i_ino, ctx->pos);
|
||||
|
||||
do {
|
||||
if (--retry_limit < 0) {
|
||||
@@ -610,7 +610,7 @@ static int afs_do_lookup_one(struct inode *dir, const struct qstr *name,
|
||||
};
|
||||
int ret;
|
||||
|
||||
_enter("{%lu},{%.*s},", dir->i_ino, name->len, name->name);
|
||||
_enter("{%llu},{%.*s},", dir->i_ino, name->len, name->name);
|
||||
|
||||
/* search the directory */
|
||||
ret = afs_dir_iterate(dir, &cookie.ctx, NULL, _dir_version);
|
||||
@@ -783,7 +783,7 @@ static struct inode *afs_do_lookup(struct inode *dir, struct dentry *dentry)
|
||||
long ret;
|
||||
int i;
|
||||
|
||||
_enter("{%lu},%p{%pd},", dir->i_ino, dentry, dentry);
|
||||
_enter("{%llu},%p{%pd},", dir->i_ino, dentry, dentry);
|
||||
|
||||
cookie = kzalloc_obj(struct afs_lookup_cookie);
|
||||
if (!cookie)
|
||||
|
||||
+1
-1
@@ -194,7 +194,7 @@ int afs_dir_search(struct afs_vnode *dvnode, const struct qstr *name,
|
||||
struct afs_dir_iter iter = { .dvnode = dvnode, };
|
||||
int ret, retry_limit = 3;
|
||||
|
||||
_enter("{%lu},,,", dvnode->netfs.inode.i_ino);
|
||||
_enter("{%llu},,,", dvnode->netfs.inode.i_ino);
|
||||
|
||||
if (!afs_dir_init_iter(&iter, name))
|
||||
return -ENOENT;
|
||||
|
||||
+1
-1
@@ -59,7 +59,7 @@ static struct inode *afs_iget_pseudo_dir(struct super_block *sb, ino_t ino)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
}
|
||||
|
||||
_debug("GOT INODE %p { ino=%lu, vl=%llx, vn=%llx, u=%x }",
|
||||
_debug("GOT INODE %p { ino=%llu, vl=%llx, vn=%llx, u=%x }",
|
||||
inode, inode->i_ino, fid.vid, fid.vnode, fid.unique);
|
||||
|
||||
vnode = AFS_FS_I(inode);
|
||||
|
||||
+1
-1
@@ -683,7 +683,7 @@ int afs_getattr(struct mnt_idmap *idmap, const struct path *path,
|
||||
struct key *key;
|
||||
int ret, seq;
|
||||
|
||||
_enter("{ ino=%lu v=%u }", inode->i_ino, inode->i_generation);
|
||||
_enter("{ ino=%llu v=%u }", inode->i_ino, inode->i_generation);
|
||||
|
||||
if (vnode->volume &&
|
||||
!(query_flags & AT_STATX_DONT_SYNC) &&
|
||||
|
||||
+1
-1
@@ -92,7 +92,7 @@ static int autofs_show_options(struct seq_file *m, struct dentry *root)
|
||||
seq_puts(m, ",ignore");
|
||||
#ifdef CONFIG_CHECKPOINT_RESTORE
|
||||
if (sbi->pipe)
|
||||
seq_printf(m, ",pipe_ino=%ld", file_inode(sbi->pipe)->i_ino);
|
||||
seq_printf(m, ",pipe_ino=%llu", file_inode(sbi->pipe)->i_ino);
|
||||
else
|
||||
seq_puts(m, ",pipe_ino=-1");
|
||||
#endif
|
||||
|
||||
+14
-14
@@ -140,20 +140,20 @@ befs_get_block(struct inode *inode, sector_t block,
|
||||
int res;
|
||||
ulong disk_off;
|
||||
|
||||
befs_debug(sb, "---> befs_get_block() for inode %lu, block %ld",
|
||||
(unsigned long)inode->i_ino, (long)block);
|
||||
befs_debug(sb, "---> befs_get_block() for inode %llu, block %ld",
|
||||
inode->i_ino, (long)block);
|
||||
if (create) {
|
||||
befs_error(sb, "befs_get_block() was asked to write to "
|
||||
"block %ld in inode %lu", (long)block,
|
||||
(unsigned long)inode->i_ino);
|
||||
"block %ld in inode %llu", (long)block,
|
||||
inode->i_ino);
|
||||
return -EPERM;
|
||||
}
|
||||
|
||||
res = befs_fblock2brun(sb, ds, block, &run);
|
||||
if (res != BEFS_OK) {
|
||||
befs_error(sb,
|
||||
"<--- %s for inode %lu, block %ld ERROR",
|
||||
__func__, (unsigned long)inode->i_ino,
|
||||
"<--- %s for inode %llu, block %ld ERROR",
|
||||
__func__, inode->i_ino,
|
||||
(long)block);
|
||||
return -EFBIG;
|
||||
}
|
||||
@@ -162,8 +162,8 @@ befs_get_block(struct inode *inode, sector_t block,
|
||||
|
||||
map_bh(bh_result, inode->i_sb, disk_off);
|
||||
|
||||
befs_debug(sb, "<--- %s for inode %lu, block %ld, disk address %lu",
|
||||
__func__, (unsigned long)inode->i_ino, (long)block,
|
||||
befs_debug(sb, "<--- %s for inode %llu, block %ld, disk address %lu",
|
||||
__func__, inode->i_ino, (long)block,
|
||||
(unsigned long)disk_off);
|
||||
|
||||
return 0;
|
||||
@@ -181,7 +181,7 @@ befs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
|
||||
char *utfname;
|
||||
const char *name = dentry->d_name.name;
|
||||
|
||||
befs_debug(sb, "---> %s name %pd inode %ld", __func__,
|
||||
befs_debug(sb, "---> %s name %pd inode %llu", __func__,
|
||||
dentry, dir->i_ino);
|
||||
|
||||
/* Convert to UTF-8 */
|
||||
@@ -224,7 +224,7 @@ befs_readdir(struct file *file, struct dir_context *ctx)
|
||||
size_t keysize;
|
||||
char keybuf[BEFS_NAME_LEN + 1];
|
||||
|
||||
befs_debug(sb, "---> %s name %pD, inode %ld, ctx->pos %lld",
|
||||
befs_debug(sb, "---> %s name %pD, inode %llu, ctx->pos %lld",
|
||||
__func__, file, inode->i_ino, ctx->pos);
|
||||
|
||||
while (1) {
|
||||
@@ -233,7 +233,7 @@ befs_readdir(struct file *file, struct dir_context *ctx)
|
||||
|
||||
if (result == BEFS_ERR) {
|
||||
befs_debug(sb, "<--- %s ERROR", __func__);
|
||||
befs_error(sb, "IO error reading %pD (inode %lu)",
|
||||
befs_error(sb, "IO error reading %pD (inode %llu)",
|
||||
file, inode->i_ino);
|
||||
return -EIO;
|
||||
|
||||
@@ -324,7 +324,7 @@ static struct inode *befs_iget(struct super_block *sb, unsigned long ino)
|
||||
bh = sb_bread(sb, inode->i_ino);
|
||||
if (!bh) {
|
||||
befs_error(sb, "unable to read inode block - "
|
||||
"inode = %lu", inode->i_ino);
|
||||
"inode = %llu", inode->i_ino);
|
||||
goto unacquire_none;
|
||||
}
|
||||
|
||||
@@ -333,7 +333,7 @@ static struct inode *befs_iget(struct super_block *sb, unsigned long ino)
|
||||
befs_dump_inode(sb, raw_inode);
|
||||
|
||||
if (befs_check_inode(sb, raw_inode, inode->i_ino) != BEFS_OK) {
|
||||
befs_error(sb, "Bad inode: %lu", inode->i_ino);
|
||||
befs_error(sb, "Bad inode: %llu", inode->i_ino);
|
||||
goto unacquire_bh;
|
||||
}
|
||||
|
||||
@@ -407,7 +407,7 @@ static struct inode *befs_iget(struct super_block *sb, unsigned long ino)
|
||||
inode->i_op = &simple_symlink_inode_operations;
|
||||
}
|
||||
} else {
|
||||
befs_error(sb, "Inode %lu is not a regular file, "
|
||||
befs_error(sb, "Inode %llu is not a regular file, "
|
||||
"directory or symlink. THAT IS WRONG! BeFS has no "
|
||||
"on disk special files", inode->i_ino);
|
||||
goto unacquire_bh;
|
||||
|
||||
+2
-2
@@ -35,7 +35,7 @@ static int bfs_readdir(struct file *f, struct dir_context *ctx)
|
||||
int block;
|
||||
|
||||
if (ctx->pos & (BFS_DIRENT_SIZE - 1)) {
|
||||
printf("Bad f_pos=%08lx for %s:%08lx\n",
|
||||
printf("Bad f_pos=%08lx for %s:%08llx\n",
|
||||
(unsigned long)ctx->pos,
|
||||
dir->i_sb->s_id, dir->i_ino);
|
||||
return -EINVAL;
|
||||
@@ -180,7 +180,7 @@ static int bfs_unlink(struct inode *dir, struct dentry *dentry)
|
||||
goto out_brelse;
|
||||
|
||||
if (!inode->i_nlink) {
|
||||
printf("unlinking non-existent file %s:%lu (nlink=%d)\n",
|
||||
printf("unlinking non-existent file %s:%llu (nlink=%d)\n",
|
||||
inode->i_sb->s_id, inode->i_ino,
|
||||
inode->i_nlink);
|
||||
set_nlink(inode, 1);
|
||||
|
||||
+3
-3
@@ -93,7 +93,7 @@ static int cachefiles_read(struct netfs_cache_resources *cres,
|
||||
object = cachefiles_cres_object(cres);
|
||||
file = cachefiles_cres_file(cres);
|
||||
|
||||
_enter("%pD,%li,%llx,%zx/%llx",
|
||||
_enter("%pD,%llu,%llx,%zx/%llx",
|
||||
file, file_inode(file)->i_ino, start_pos, len,
|
||||
i_size_read(file_inode(file)));
|
||||
|
||||
@@ -214,7 +214,7 @@ static int cachefiles_query_occupancy(struct netfs_cache_resources *cres,
|
||||
file = cachefiles_cres_file(cres);
|
||||
granularity = max_t(size_t, object->volume->cache->bsize, granularity);
|
||||
|
||||
_enter("%pD,%li,%llx,%zx/%llx",
|
||||
_enter("%pD,%llu,%llx,%zx/%llx",
|
||||
file, file_inode(file)->i_ino, start, len,
|
||||
i_size_read(file_inode(file)));
|
||||
|
||||
@@ -294,7 +294,7 @@ int __cachefiles_write(struct cachefiles_object *object,
|
||||
fscache_count_write();
|
||||
cache = object->volume->cache;
|
||||
|
||||
_enter("%pD,%li,%llx,%zx/%llx",
|
||||
_enter("%pD,%llu,%llx,%zx/%llx",
|
||||
file, file_inode(file)->i_ino, start_pos, len,
|
||||
i_size_read(file_inode(file)));
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user