diff options
| author | Eric Van Hensbergen <ericvh@kernel.org> | 2024-01-05 22:03:16 +0300 |
|---|---|---|
| committer | Eric Van Hensbergen <ericvh@kernel.org> | 2024-01-26 19:46:56 +0300 |
| commit | b91a26696ef38eae1442aa03104e60bb49d2ac99 (patch) | |
| tree | 65f28d68f9ab2327d0be8b33c32f468b29d5a92d /fs/9p/vfs_inode.c | |
| parent | f61c906a7dffaa21b28c52000a75f2c6554a8199 (diff) | |
| download | linux-b91a26696ef38eae1442aa03104e60bb49d2ac99.tar.xz | |
fs/9p: rework qid2ino logic
This changes from a function to a macro because we can
figure out if we are 32 or 64 bit at compile time.
Signed-off-by: Eric Van Hensbergen <ericvh@kernel.org>
Diffstat (limited to 'fs/9p/vfs_inode.c')
| -rw-r--r-- | fs/9p/vfs_inode.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index 8da32de3c318..f70d712227aa 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c @@ -402,7 +402,6 @@ static struct inode *v9fs_qid_iget(struct super_block *sb, dev_t rdev; int retval; umode_t umode; - unsigned long i_ino; struct inode *inode; struct v9fs_session_info *v9ses = sb->s_fs_info; int (*test)(struct inode *inode, void *data); @@ -412,8 +411,7 @@ static struct inode *v9fs_qid_iget(struct super_block *sb, else test = v9fs_test_inode; - i_ino = v9fs_qid2ino(qid); - inode = iget5_locked(sb, i_ino, test, v9fs_set_inode, st); + inode = iget5_locked(sb, QID2INO(qid), test, v9fs_set_inode, st); if (!inode) return ERR_PTR(-ENOMEM); if (!(inode->i_state & I_NEW)) @@ -423,7 +421,7 @@ static struct inode *v9fs_qid_iget(struct super_block *sb, * FIXME!! we may need support for stale inodes * later. */ - inode->i_ino = i_ino; + inode->i_ino = QID2INO(qid); umode = p9mode2unixmode(v9ses, st, &rdev); retval = v9fs_init_inode(v9ses, inode, umode, rdev); if (retval) @@ -1157,26 +1155,6 @@ v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode, } /** - * v9fs_qid2ino - convert qid into inode number - * @qid: qid to hash - * - * BUG: potential for inode number collisions? - */ - -ino_t v9fs_qid2ino(struct p9_qid *qid) -{ - u64 path = qid->path + 2; - ino_t i = 0; - - if (sizeof(ino_t) == sizeof(path)) - memcpy(&i, &path, sizeof(ino_t)); - else - i = (ino_t) (path ^ (path >> 32)); - - return i; -} - -/** * v9fs_vfs_get_link - follow a symlink path * @dentry: dentry for symlink * @inode: inode for symlink |