| Message ID | 20200522044035.24190-1-cgxu519@mykernel.net |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [1/2] ext2: fix incorrect i_op for special inode | expand |
On Fri 22-05-20 12:40:34, Chengguang Xu wrote: > We should always set &ext2_special_inode_operations to i_op > for special inode regardless of CONFIG_EXT2_FS_XATTR setting. > > Signed-off-by: Chengguang Xu <cgxu519@mykernel.net> Thanks. I've applied both patches. I've just slightly expanded changelog of this patch to better explain the implications of the change. Honza > --- > fs/ext2/namei.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c > index ccfbbf59e2fc..1a5421a34ef7 100644 > --- a/fs/ext2/namei.c > +++ b/fs/ext2/namei.c > @@ -136,9 +136,7 @@ static int ext2_mknod (struct inode * dir, struct dentry *dentry, umode_t mode, > err = PTR_ERR(inode); > if (!IS_ERR(inode)) { > init_special_inode(inode, inode->i_mode, rdev); > -#ifdef CONFIG_EXT2_FS_XATTR > inode->i_op = &ext2_special_inode_operations; > -#endif > mark_inode_dirty(inode); > err = ext2_add_nondir(dentry, inode); > } > -- > 2.20.1 > >
diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c index ccfbbf59e2fc..1a5421a34ef7 100644 --- a/fs/ext2/namei.c +++ b/fs/ext2/namei.c @@ -136,9 +136,7 @@ static int ext2_mknod (struct inode * dir, struct dentry *dentry, umode_t mode, err = PTR_ERR(inode); if (!IS_ERR(inode)) { init_special_inode(inode, inode->i_mode, rdev); -#ifdef CONFIG_EXT2_FS_XATTR inode->i_op = &ext2_special_inode_operations; -#endif mark_inode_dirty(inode); err = ext2_add_nondir(dentry, inode); }
We should always set &ext2_special_inode_operations to i_op for special inode regardless of CONFIG_EXT2_FS_XATTR setting. Signed-off-by: Chengguang Xu <cgxu519@mykernel.net> --- fs/ext2/namei.c | 2 -- 1 file changed, 2 deletions(-)