2019-08-02 23:22:12

by Gao Xiang

Subject: [PATCH v6 06/24] erofs: support special inode

This patch adds to support special inode, such as
block dev, char, socket, pipe inode.

Signed-off-by: Gao Xiang <[email protected]>
---
fs/erofs/inode.c | 27 +++++++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c
index b6ea997bc4ae..637bf6e4de44 100644
--- a/fs/erofs/inode.c
+++ b/fs/erofs/inode.c
@@ -34,7 +34,16 @@ static int read_inode(struct inode *inode, void *data)
vi->xattr_isize = ondisk_xattr_ibody_size(v2->i_xattr_icount);

inode->i_mode = le16_to_cpu(v2->i_mode);
- vi->raw_blkaddr = le32_to_cpu(v2->i_u.raw_blkaddr);
+ if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
+ S_ISLNK(inode->i_mode))
+ vi->raw_blkaddr = le32_to_cpu(v2->i_u.raw_blkaddr);
+ else if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
+ inode->i_rdev =
+ new_decode_dev(le32_to_cpu(v2->i_u.rdev));
+ else if (S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode))
+ inode->i_rdev = 0;
+ else
+ return -EIO;

i_uid_write(inode, le32_to_cpu(v2->i_uid));
i_gid_write(inode, le32_to_cpu(v2->i_gid));
@@ -58,7 +67,16 @@ static int read_inode(struct inode *inode, void *data)
vi->xattr_isize = ondisk_xattr_ibody_size(v1->i_xattr_icount);

inode->i_mode = le16_to_cpu(v1->i_mode);
- vi->raw_blkaddr = le32_to_cpu(v1->i_u.raw_blkaddr);
+ if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
+ S_ISLNK(inode->i_mode))
+ vi->raw_blkaddr = le32_to_cpu(v1->i_u.raw_blkaddr);
+ else if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
+ inode->i_rdev =
+ new_decode_dev(le32_to_cpu(v1->i_u.rdev));
+ else if (S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode))
+ inode->i_rdev = 0;
+ else
+ return -EIO;

i_uid_write(inode, le16_to_cpu(v1->i_uid));
i_gid_write(inode, le16_to_cpu(v1->i_gid));
@@ -176,6 +194,11 @@ static int fill_inode(struct inode *inode, int isdir)
/* by default, page_get_link is used for symlink */
inode->i_op = &erofs_symlink_iops;
inode_nohighmem(inode);
+ } else if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode) ||
+ S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode)) {
+ inode->i_op = &erofs_generic_iops;
+ init_special_inode(inode, inode->i_mode, inode->i_rdev);
+ goto out_unlock;
} else {
err = -EIO;
goto out_unlock;
--
2.17.1

2019-08-29 10:26:34

by Christoph Hellwig

Subject: Re: [PATCH v6 06/24] erofs: support special inode

On Fri, Aug 02, 2019 at 08:53:29PM +0800, Gao Xiang wrote:
> This patch adds to support special inode, such as
> block dev, char, socket, pipe inode.
>
> Signed-off-by: Gao Xiang <[email protected]>
> ---
> fs/erofs/inode.c | 27 +++++++++++++++++++++++++--
> 1 file changed, 25 insertions(+), 2 deletions(-)
>
> diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c
> index b6ea997bc4ae..637bf6e4de44 100644
> --- a/fs/erofs/inode.c
> +++ b/fs/erofs/inode.c
> @@ -34,7 +34,16 @@ static int read_inode(struct inode *inode, void *data)
> vi->xattr_isize = ondisk_xattr_ibody_size(v2->i_xattr_icount);
>
> inode->i_mode = le16_to_cpu(v2->i_mode);
> - vi->raw_blkaddr = le32_to_cpu(v2->i_u.raw_blkaddr);
> + if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
> + S_ISLNK(inode->i_mode))
> + vi->raw_blkaddr = le32_to_cpu(v2->i_u.raw_blkaddr);
> + else if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
> + inode->i_rdev =
> + new_decode_dev(le32_to_cpu(v2->i_u.rdev));
> + else if (S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode))
> + inode->i_rdev = 0;
> + else
> + return -EIO;

Please use a switch statement when dealing with the file modes to
make everything easier to read.

2019-09-01 09:42:38

by Gao Xiang

Subject: Re: [PATCH v6 06/24] erofs: support special inode

Hi Christoph,

On Thu, Aug 29, 2019 at 03:25:03AM -0700, Christoph Hellwig wrote:
> On Fri, Aug 02, 2019 at 08:53:29PM +0800, Gao Xiang wrote:
> > This patch adds to support special inode, such as
> > block dev, char, socket, pipe inode.
> >
> > Signed-off-by: Gao Xiang <[email protected]>
> > ---
> > fs/erofs/inode.c | 27 +++++++++++++++++++++++++--
> > 1 file changed, 25 insertions(+), 2 deletions(-)
> >
> > diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c
> > index b6ea997bc4ae..637bf6e4de44 100644
> > --- a/fs/erofs/inode.c
> > +++ b/fs/erofs/inode.c
> > @@ -34,7 +34,16 @@ static int read_inode(struct inode *inode, void *data)
> > vi->xattr_isize = ondisk_xattr_ibody_size(v2->i_xattr_icount);
> >
> > inode->i_mode = le16_to_cpu(v2->i_mode);
> > - vi->raw_blkaddr = le32_to_cpu(v2->i_u.raw_blkaddr);
> > + if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
> > + S_ISLNK(inode->i_mode))
> > + vi->raw_blkaddr = le32_to_cpu(v2->i_u.raw_blkaddr);
> > + else if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
> > + inode->i_rdev =
> > + new_decode_dev(le32_to_cpu(v2->i_u.rdev));
> > + else if (S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode))
> > + inode->i_rdev = 0;
> > + else
> > + return -EIO;
>
> Please use a switch statement when dealing with the file modes to
> make everything easier to read.

Fixed in
https://lore.kernel.org/linux-fsdevel/[email protected]/

Thanks,
Gao Xiang