Skip to content

Commit e3177f4

Browse files
martinetdgregkh
martinetd
authored and
gregkh
committed
Revert " fs/9p: mitigate inode collisions"
commit f69999b upstream. This reverts commit d05dcfd. This is a requirement to revert commit 724a084 ("fs/9p: simplify iget to remove unnecessary paths"), see that revert for details. Fixes: 724a084 ("fs/9p: simplify iget to remove unnecessary paths") Reported-by: Will Deacon <will@kernel.org> Link: https://lkml.kernel.org/r/20240923100508.GA32066@willie-the-truck Cc: stable@vger.kernel.org # v6.9+ Message-ID: <20241024-revert_iget-v1-1-4cac63d25f72@codewreck.org> Signed-off-by: Dominique Martinet <asmadeus@codewreck.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 1e235d0 commit e3177f4

4 files changed

Lines changed: 22 additions & 56 deletions

File tree

‎fs/9p/v9fs.h‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,14 +179,13 @@ extern int v9fs_vfs_rename(struct mnt_idmap *idmap,
179179
struct inode *old_dir, struct dentry *old_dentry,
180180
struct inode *new_dir, struct dentry *new_dentry,
181181
unsigned int flags);
182-
extern struct inode *v9fs_fid_iget(struct super_block *sb, struct p9_fid *fid,
183-
bool new);
182+
extern struct inode *v9fs_fid_iget(struct super_block *sb, struct p9_fid *fid);
184183
extern const struct inode_operations v9fs_dir_inode_operations_dotl;
185184
extern const struct inode_operations v9fs_file_inode_operations_dotl;
186185
extern const struct inode_operations v9fs_symlink_inode_operations_dotl;
187186
extern const struct netfs_request_ops v9fs_req_ops;
188187
extern struct inode *v9fs_fid_iget_dotl(struct super_block *sb,
189-
struct p9_fid *fid, bool new);
188+
struct p9_fid *fid);
190189

191190
/* other default globals */
192191
#define V9FS_PORT 564
@@ -225,12 +224,12 @@ static inline int v9fs_proto_dotl(struct v9fs_session_info *v9ses)
225224
*/
226225
static inline struct inode *
227226
v9fs_get_inode_from_fid(struct v9fs_session_info *v9ses, struct p9_fid *fid,
228-
struct super_block *sb, bool new)
227+
struct super_block *sb)
229228
{
230229
if (v9fs_proto_dotl(v9ses))
231-
return v9fs_fid_iget_dotl(sb, fid, new);
230+
return v9fs_fid_iget_dotl(sb, fid);
232231
else
233-
return v9fs_fid_iget(sb, fid, new);
232+
return v9fs_fid_iget(sb, fid);
234233
}
235234

236235
#endif

‎fs/9p/vfs_inode.c‎

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,7 @@ void v9fs_evict_inode(struct inode *inode)
365365
clear_inode(inode);
366366
}
367367

368-
struct inode *
369-
v9fs_fid_iget(struct super_block *sb, struct p9_fid *fid, bool new)
368+
struct inode *v9fs_fid_iget(struct super_block *sb, struct p9_fid *fid)
370369
{
371370
dev_t rdev;
372371
int retval;
@@ -378,18 +377,8 @@ v9fs_fid_iget(struct super_block *sb, struct p9_fid *fid, bool new)
378377
inode = iget_locked(sb, QID2INO(&fid->qid));
379378
if (unlikely(!inode))
380379
return ERR_PTR(-ENOMEM);
381-
if (!(inode->i_state & I_NEW)) {
382-
if (!new) {
383-
goto done;
384-
} else {
385-
p9_debug(P9_DEBUG_VFS, "WARNING: Inode collision %ld\n",
386-
inode->i_ino);
387-
iput(inode);
388-
remove_inode_hash(inode);
389-
inode = iget_locked(sb, QID2INO(&fid->qid));
390-
WARN_ON(!(inode->i_state & I_NEW));
391-
}
392-
}
380+
if (!(inode->i_state & I_NEW))
381+
return inode;
393382

394383
/*
395384
* initialize the inode with the stat info
@@ -413,11 +402,11 @@ v9fs_fid_iget(struct super_block *sb, struct p9_fid *fid, bool new)
413402
v9fs_set_netfs_context(inode);
414403
v9fs_cache_inode_get_cookie(inode);
415404
unlock_new_inode(inode);
416-
done:
417405
return inode;
418406
error:
419407
iget_failed(inode);
420408
return ERR_PTR(retval);
409+
421410
}
422411

423412
/**
@@ -449,15 +438,8 @@ static int v9fs_at_to_dotl_flags(int flags)
449438
*/
450439
static void v9fs_dec_count(struct inode *inode)
451440
{
452-
if (!S_ISDIR(inode->i_mode) || inode->i_nlink > 2) {
453-
if (inode->i_nlink) {
454-
drop_nlink(inode);
455-
} else {
456-
p9_debug(P9_DEBUG_VFS,
457-
"WARNING: unexpected i_nlink zero %d inode %ld\n",
458-
inode->i_nlink, inode->i_ino);
459-
}
460-
}
441+
if (!S_ISDIR(inode->i_mode) || inode->i_nlink > 2)
442+
drop_nlink(inode);
461443
}
462444

463445
/**
@@ -508,9 +490,6 @@ static int v9fs_remove(struct inode *dir, struct dentry *dentry, int flags)
508490
} else
509491
v9fs_dec_count(inode);
510492

511-
if (inode->i_nlink <= 0) /* no more refs unhash it */
512-
remove_inode_hash(inode);
513-
514493
v9fs_invalidate_inode_attr(inode);
515494
v9fs_invalidate_inode_attr(dir);
516495

@@ -576,7 +555,7 @@ v9fs_create(struct v9fs_session_info *v9ses, struct inode *dir,
576555
/*
577556
* instantiate inode and assign the unopened fid to the dentry
578557
*/
579-
inode = v9fs_get_inode_from_fid(v9ses, fid, dir->i_sb, true);
558+
inode = v9fs_get_inode_from_fid(v9ses, fid, dir->i_sb);
580559
if (IS_ERR(inode)) {
581560
err = PTR_ERR(inode);
582561
p9_debug(P9_DEBUG_VFS,
@@ -705,7 +684,7 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry,
705684
else if (IS_ERR(fid))
706685
inode = ERR_CAST(fid);
707686
else
708-
inode = v9fs_get_inode_from_fid(v9ses, fid, dir->i_sb, false);
687+
inode = v9fs_get_inode_from_fid(v9ses, fid, dir->i_sb);
709688
/*
710689
* If we had a rename on the server and a parallel lookup
711690
* for the new name, then make sure we instantiate with

‎fs/9p/vfs_inode_dotl.c‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,7 @@ static kgid_t v9fs_get_fsgid_for_create(struct inode *dir_inode)
5252
return current_fsgid();
5353
}
5454

55-
56-
57-
struct inode *
58-
v9fs_fid_iget_dotl(struct super_block *sb, struct p9_fid *fid, bool new)
55+
struct inode *v9fs_fid_iget_dotl(struct super_block *sb, struct p9_fid *fid)
5956
{
6057
int retval;
6158
struct inode *inode;
@@ -65,18 +62,8 @@ v9fs_fid_iget_dotl(struct super_block *sb, struct p9_fid *fid, bool new)
6562
inode = iget_locked(sb, QID2INO(&fid->qid));
6663
if (unlikely(!inode))
6764
return ERR_PTR(-ENOMEM);
68-
if (!(inode->i_state & I_NEW)) {
69-
if (!new) {
70-
goto done;
71-
} else { /* deal with race condition in inode number reuse */
72-
p9_debug(P9_DEBUG_ERROR, "WARNING: Inode collision %lx\n",
73-
inode->i_ino);
74-
iput(inode);
75-
remove_inode_hash(inode);
76-
inode = iget_locked(sb, QID2INO(&fid->qid));
77-
WARN_ON(!(inode->i_state & I_NEW));
78-
}
79-
}
65+
if (!(inode->i_state & I_NEW))
66+
return inode;
8067

8168
/*
8269
* initialize the inode with the stat info
@@ -103,11 +90,12 @@ v9fs_fid_iget_dotl(struct super_block *sb, struct p9_fid *fid, bool new)
10390
goto error;
10491

10592
unlock_new_inode(inode);
106-
done:
93+
10794
return inode;
10895
error:
10996
iget_failed(inode);
11097
return ERR_PTR(retval);
98+
11199
}
112100

113101
struct dotl_openflag_map {
@@ -259,7 +247,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
259247
p9_debug(P9_DEBUG_VFS, "p9_client_walk failed %d\n", err);
260248
goto out;
261249
}
262-
inode = v9fs_fid_iget_dotl(dir->i_sb, fid, true);
250+
inode = v9fs_fid_iget_dotl(dir->i_sb, fid);
263251
if (IS_ERR(inode)) {
264252
err = PTR_ERR(inode);
265253
p9_debug(P9_DEBUG_VFS, "inode creation failed %d\n", err);
@@ -352,7 +340,7 @@ static int v9fs_vfs_mkdir_dotl(struct mnt_idmap *idmap,
352340
}
353341

354342
/* instantiate inode and assign the unopened fid to the dentry */
355-
inode = v9fs_fid_iget_dotl(dir->i_sb, fid, true);
343+
inode = v9fs_fid_iget_dotl(dir->i_sb, fid);
356344
if (IS_ERR(inode)) {
357345
err = PTR_ERR(inode);
358346
p9_debug(P9_DEBUG_VFS, "inode creation failed %d\n",
@@ -788,7 +776,7 @@ v9fs_vfs_mknod_dotl(struct mnt_idmap *idmap, struct inode *dir,
788776
err);
789777
goto error;
790778
}
791-
inode = v9fs_fid_iget_dotl(dir->i_sb, fid, true);
779+
inode = v9fs_fid_iget_dotl(dir->i_sb, fid);
792780
if (IS_ERR(inode)) {
793781
err = PTR_ERR(inode);
794782
p9_debug(P9_DEBUG_VFS, "inode creation failed %d\n",

‎fs/9p/vfs_super.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ static struct dentry *v9fs_mount(struct file_system_type *fs_type, int flags,
139139
else
140140
sb->s_d_op = &v9fs_dentry_operations;
141141

142-
inode = v9fs_get_inode_from_fid(v9ses, fid, sb, true);
142+
inode = v9fs_get_inode_from_fid(v9ses, fid, sb);
143143
if (IS_ERR(inode)) {
144144
retval = PTR_ERR(inode);
145145
goto release_sb;

0 commit comments

Comments
 (0)