Pull shmem rename fixes from Al Viro: "A couple of shmem rename fixes - recent regression from tree-in-dcache series and older breakage from stable directory offsets stuff" * tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: shmem: fix recovery on rename failures shmem_whiteout(): fix regression from tree-in-dcache series
Showing the changes to include/linux (1 of 3 files). Show all
Unified · Split
| @@ -3247,7 +3247,7 @@ struct offset_ctx { · 3246 unmodified lines | ||
| 3247 | 3247 | void simple_offset_init(struct offset_ctx *octx); |
| 3248 | 3248 | int simple_offset_add(struct offset_ctx *octx, struct dentry *dentry); |
| 3249 | 3249 | void simple_offset_remove(struct offset_ctx *octx, struct dentry *dentry); |
| 3250 | −int simple_offset_rename(struct inode *old_dir, struct dentry *old_dentry, | |
| 3250 | +void simple_offset_rename(struct inode *old_dir, struct dentry *old_dentry, | |
| 3251 | 3251 | struct inode *new_dir, struct dentry *new_dentry); |
| 3252 | 3252 | int simple_offset_rename_exchange(struct inode *old_dir, |
| 3253 | 3253 | struct dentry *old_dentry, |