[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected. No action required from the submitter.
The upstream commit SHA1 provided is correct: 974e3fe0ac61de85015bbe5a4990cf4127b304b2
WARNING: Author mismatch between patch and upstream commit: Backport author: jianqi.ren.cn@windriver.com Commit author: Amir Goldsteinamir73il@gmail.com
Status in newer kernel trees: 6.14.y | Present (exact SHA1) 6.12.y | Present (different SHA1: adcde2872f8f) 6.6.y | Present (different SHA1: f47c834a9131) 6.1.y | Not found
Note: The patch differs from the upstream commit: --- 1: 974e3fe0ac61d ! 1: edec8bb9ab27c fs: relax assertions on failure to encode file handles @@ Metadata ## Commit message ## fs: relax assertions on failure to encode file handles
+ commit 974e3fe0ac61de85015bbe5a4990cf4127b304b2 upstream. + Encoding file handles is usually performed by a filesystem >encode_fh() method that may fail for various reasons.
@@ Commit message Signed-off-by: Amir Goldstein amir73il@gmail.com Link: https://lore.kernel.org/r/20241219115301.465396-1-amir73il@gmail.com Signed-off-by: Christian Brauner brauner@kernel.org + [Minor conflict resolved due to code context change.] + Signed-off-by: Jianqi Ren jianqi.ren.cn@windriver.com + Signed-off-by: He Zhe zhe.he@windriver.com
## fs/notify/fdinfo.c ## @@ fs/notify/fdinfo.c: static void show_mark_fhandle(struct seq_file *m, struct inode *inode) - size = f->handle_bytes >> 2; + size = f.handle.handle_bytes >> 2;
- ret = exportfs_encode_fid(inode, (struct fid *)f->f_handle, &size); + ret = exportfs_encode_inode_fh(inode, (struct fid *)f.handle.f_handle, &size, NULL); - if ((ret == FILEID_INVALID) || (ret < 0)) { - WARN_ONCE(1, "Can't encode file handler for inotify: %d\n", ret); + if ((ret == FILEID_INVALID) || (ret < 0)) return; - }
- f->handle_type = ret; - f->handle_bytes = size * sizeof(u32); + f.handle.handle_type = ret; + f.handle.handle_bytes = size * sizeof(u32);
## fs/overlayfs/copy_up.c ## @@ fs/overlayfs/copy_up.c: struct ovl_fh *ovl_encode_real_fh(struct ovl_fs *ofs, struct dentry *real, ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-5.15.y | Success | Success |