Unverified Commit 96fefcab authored by Jeff Layton's avatar Jeff Layton Committed by Christian Brauner
Browse files

vfs: widen inode hash/lookup functions to u64 



Change the inode hash/lookup VFS API functions to accept u64 parameters
instead of unsigned long for inode numbers and hash values. This is
preparation for widening i_ino itself to u64, which will allow
filesystems to store full 64-bit inode numbers on 32-bit architectures.

Since unsigned long implicitly widens to u64 on all architectures, this
change is backward-compatible with all existing callers.

Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Link: https://patch.msgid.link/20260304-iino-u64-v3-1-2257ad83d372@kernel.org


Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 6de23f81

fs/f2fs/node.c

+1 −1
Original line number Diff line number Diff line
@@ -1997,7 +1997,7 @@ int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode, 
	return ret;

}



static int f2fs_match_ino(struct inode *inode, unsigned long ino, void *data)

static int f2fs_match_ino(struct inode *inode, u64 ino, void *data)

{

	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);

	bool clean;

fs/inode.c

+18 −18
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ static inline void inode_sb_list_del(struct inode *inode) 
	}

}



static unsigned long hash(struct super_block *sb, unsigned long hashval)

static unsigned long hash(struct super_block *sb, u64 hashval)

{

	unsigned long tmp;
@@ -685,12 +685,12 @@ static unsigned long hash(struct super_block *sb, unsigned long hashval) 
/**

 *	__insert_inode_hash - hash an inode

 *	@inode: unhashed inode

 *	@hashval: unsigned long value used to locate this object in the

 *	@hashval: u64 value used to locate this object in the

 *		inode_hashtable.

 *

 *	Add an inode to the inode hash for this superblock.

 */

void __insert_inode_hash(struct inode *inode, unsigned long hashval)

void __insert_inode_hash(struct inode *inode, u64 hashval)

{

	struct hlist_head *b = inode_hashtable + hash(inode->i_sb, hashval);
@@ -1087,7 +1087,7 @@ static struct inode *find_inode(struct super_block *sb, 
 * iget_locked for details.

 */

static struct inode *find_inode_fast(struct super_block *sb,

				struct hlist_head *head, unsigned long ino,

				struct hlist_head *head, u64 ino,

				bool hash_locked, bool *isnew)

{

	struct inode *inode = NULL;
@@ -1301,7 +1301,7 @@ EXPORT_SYMBOL(unlock_two_nondirectories); 
 * Note that both @test and @set are called with the inode_hash_lock held, so

 * they can't sleep.

 */

struct inode *inode_insert5(struct inode *inode, unsigned long hashval,

struct inode *inode_insert5(struct inode *inode, u64 hashval,

			    int (*test)(struct inode *, void *),

			    int (*set)(struct inode *, void *), void *data)

{
@@ -1378,7 +1378,7 @@ EXPORT_SYMBOL(inode_insert5); 
 * Note that both @test and @set are called with the inode_hash_lock held, so

 * they can't sleep.

 */

struct inode *iget5_locked(struct super_block *sb, unsigned long hashval,

struct inode *iget5_locked(struct super_block *sb, u64 hashval,

		int (*test)(struct inode *, void *),

		int (*set)(struct inode *, void *), void *data)

{
@@ -1408,7 +1408,7 @@ EXPORT_SYMBOL(iget5_locked); 
 * This is equivalent to iget5_locked, except the @test callback must

 * tolerate the inode not being stable, including being mid-teardown.

 */

struct inode *iget5_locked_rcu(struct super_block *sb, unsigned long hashval,

struct inode *iget5_locked_rcu(struct super_block *sb, u64 hashval,

		int (*test)(struct inode *, void *),

		int (*set)(struct inode *, void *), void *data)

{
@@ -1455,7 +1455,7 @@ EXPORT_SYMBOL_GPL(iget5_locked_rcu); 
 * hashed, and with the I_NEW flag set.  The file system gets to fill it in

 * before unlocking it via unlock_new_inode().

 */

struct inode *iget_locked(struct super_block *sb, unsigned long ino)

struct inode *iget_locked(struct super_block *sb, u64 ino)

{

	struct hlist_head *head = inode_hashtable + hash(sb, ino);

	struct inode *inode;
@@ -1527,7 +1527,7 @@ EXPORT_SYMBOL(iget_locked); 
 *

 * Returns 1 if the inode number is unique, 0 if it is not.

 */

static int test_inode_iunique(struct super_block *sb, unsigned long ino)

static int test_inode_iunique(struct super_block *sb, u64 ino)

{

	struct hlist_head *b = inode_hashtable + hash(sb, ino);

	struct inode *inode;
@@ -1616,7 +1616,7 @@ EXPORT_SYMBOL(igrab); 
 *

 * Note2: @test is called with the inode_hash_lock held, so can't sleep.

 */

struct inode *ilookup5_nowait(struct super_block *sb, unsigned long hashval,

struct inode *ilookup5_nowait(struct super_block *sb, u64 hashval,

		int (*test)(struct inode *, void *), void *data, bool *isnew)

{

	struct hlist_head *head = inode_hashtable + hash(sb, hashval);
@@ -1647,7 +1647,7 @@ EXPORT_SYMBOL(ilookup5_nowait); 
 *

 * Note: @test is called with the inode_hash_lock held, so can't sleep.

 */

struct inode *ilookup5(struct super_block *sb, unsigned long hashval,

struct inode *ilookup5(struct super_block *sb, u64 hashval,

		int (*test)(struct inode *, void *), void *data)

{

	struct inode *inode;
@@ -1677,7 +1677,7 @@ EXPORT_SYMBOL(ilookup5); 
 * Search for the inode @ino in the inode cache, and if the inode is in the

 * cache, the inode is returned with an incremented reference count.

 */

struct inode *ilookup(struct super_block *sb, unsigned long ino)

struct inode *ilookup(struct super_block *sb, u64 ino)

{

	struct hlist_head *head = inode_hashtable + hash(sb, ino);

	struct inode *inode;
@@ -1726,8 +1726,8 @@ EXPORT_SYMBOL(ilookup); 
 * very carefully implemented.

 */

struct inode *find_inode_nowait(struct super_block *sb,

				unsigned long hashval,

				int (*match)(struct inode *, unsigned long,

				u64 hashval,

				int (*match)(struct inode *, u64,

					     void *),

				void *data)

{
@@ -1773,7 +1773,7 @@ EXPORT_SYMBOL(find_inode_nowait); 
 *

 * The caller must hold the RCU read lock.

 */

struct inode *find_inode_rcu(struct super_block *sb, unsigned long hashval,

struct inode *find_inode_rcu(struct super_block *sb, u64 hashval,

			     int (*test)(struct inode *, void *), void *data)

{

	struct hlist_head *head = inode_hashtable + hash(sb, hashval);
@@ -1812,7 +1812,7 @@ EXPORT_SYMBOL(find_inode_rcu); 
 * The caller must hold the RCU read lock.

 */

struct inode *find_inode_by_ino_rcu(struct super_block *sb,

				    unsigned long ino)

				    u64 ino)

{

	struct hlist_head *head = inode_hashtable + hash(sb, ino);

	struct inode *inode;
@@ -1833,7 +1833,7 @@ EXPORT_SYMBOL(find_inode_by_ino_rcu); 
int insert_inode_locked(struct inode *inode)

{

	struct super_block *sb = inode->i_sb;

	ino_t ino = inode->i_ino;

	u64 ino = inode->i_ino;

	struct hlist_head *head = inode_hashtable + hash(sb, ino);

	bool isnew;
@@ -1884,7 +1884,7 @@ int insert_inode_locked(struct inode *inode) 
}

EXPORT_SYMBOL(insert_inode_locked);



int insert_inode_locked4(struct inode *inode, unsigned long hashval,

int insert_inode_locked4(struct inode *inode, u64 hashval,

		int (*test)(struct inode *, void *), void *data)

{

	struct inode *old;

include/linux/fs.h

+22 −24
Original line number Diff line number Diff line
@@ -2934,33 +2934,31 @@ static inline int inode_generic_drop(struct inode *inode) 
}

extern void d_mark_dontcache(struct inode *inode);



extern struct inode *ilookup5_nowait(struct super_block *sb,

		unsigned long hashval, int (*test)(struct inode *, void *),

		void *data, bool *isnew);

extern struct inode *ilookup5(struct super_block *sb, unsigned long hashval,

struct inode *ilookup5_nowait(struct super_block *sb, u64 hashval,

			      int (*test)(struct inode *, void *), void *data,

			      bool *isnew);

struct inode *ilookup5(struct super_block *sb, u64 hashval,

		       int (*test)(struct inode *, void *), void *data);

extern struct inode *ilookup(struct super_block *sb, unsigned long ino);

struct inode *ilookup(struct super_block *sb, u64 ino);



extern struct inode *inode_insert5(struct inode *inode, unsigned long hashval,

struct inode *inode_insert5(struct inode *inode, u64 hashval,

			    int (*test)(struct inode *, void *),

		int (*set)(struct inode *, void *),

		void *data);

struct inode *iget5_locked(struct super_block *, unsigned long,

			    int (*set)(struct inode *, void *), void *data);

struct inode *iget5_locked(struct super_block *, u64,

			   int (*test)(struct inode *, void *),

			   int (*set)(struct inode *, void *), void *);

struct inode *iget5_locked_rcu(struct super_block *, unsigned long,

struct inode *iget5_locked_rcu(struct super_block *, u64,

			       int (*test)(struct inode *, void *),

			       int (*set)(struct inode *, void *), void *);

extern struct inode * iget_locked(struct super_block *, unsigned long);

extern struct inode *find_inode_nowait(struct super_block *,

				       unsigned long,

				       int (*match)(struct inode *,

						    unsigned long, void *),

struct inode *iget_locked(struct super_block *, u64);

struct inode *find_inode_nowait(struct super_block *, u64,

				int (*match)(struct inode *, u64, void *),

				void *data);

extern struct inode *find_inode_rcu(struct super_block *, unsigned long,

struct inode *find_inode_rcu(struct super_block *, u64,

			     int (*)(struct inode *, void *), void *);

extern struct inode *find_inode_by_ino_rcu(struct super_block *, unsigned long);

extern int insert_inode_locked4(struct inode *, unsigned long, int (*test)(struct inode *, void *), void *);

struct inode *find_inode_by_ino_rcu(struct super_block *, u64);

int insert_inode_locked4(struct inode *, u64,

			 int (*test)(struct inode *, void *), void *);

extern int insert_inode_locked(struct inode *);

#ifdef CONFIG_DEBUG_LOCK_ALLOC

extern void lockdep_annotate_inode_mutex_key(struct inode *inode);
@@ -3015,7 +3013,7 @@ int setattr_should_drop_sgid(struct mnt_idmap *idmap, 
 */

#define alloc_inode_sb(_sb, _cache, _gfp) kmem_cache_alloc_lru(_cache, &_sb->s_inode_lru, _gfp)



extern void __insert_inode_hash(struct inode *, unsigned long hashval);

void __insert_inode_hash(struct inode *, u64 hashval);

static inline void insert_inode_hash(struct inode *inode)

{

	__insert_inode_hash(inode, inode->i_ino);