From: Gao Xiang <gaoxiang25@huawei.com> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, <devel@driverdev.osuosl.org> Cc: <linux-fsdevel@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-erofs@lists.ozlabs.org>, <yuchao0@huawei.com>, <miaoxie@huawei.com>, <weidu.du@huawei.com>, <hsiangkao@aol.com>, <chao@kernel.org> Subject: [PATCH 10/25] staging: erofs: support special inode Date: Thu, 26 Jul 2018 20:21:53 +0800 [thread overview] Message-ID: <1532607728-103372-11-git-send-email-gaoxiang25@huawei.com> (raw) In-Reply-To: <1532607728-103372-1-git-send-email-gaoxiang25@huawei.com> From: Chao Yu <yuchao0@huawei.com> This patch adds to support special inode, such as block dev, char, socket, pipe inode. Reviewed-by: Gao Xiang <gaoxiang25@huawei.com> Signed-off-by: Chao Yu <yuchao0@huawei.com> --- drivers/staging/erofs/inode.c | 36 ++++++++++++++++++++++++++++++++++-- drivers/staging/erofs/internal.h | 1 + 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/drivers/staging/erofs/inode.c b/drivers/staging/erofs/inode.c index 15ed919..c011811 100644 --- a/drivers/staging/erofs/inode.c +++ b/drivers/staging/erofs/inode.c @@ -34,8 +34,18 @@ static int read_inode(struct inode *inode, void *data) vi->inode_isize = sizeof(struct erofs_inode_v2); vi->xattr_isize = ondisk_xattr_ibody_size(v2->i_xattr_icount); - vi->raw_blkaddr = le32_to_cpu(v2->i_u.raw_blkaddr); inode->i_mode = le16_to_cpu(v2->i_mode); + 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)); @@ -54,8 +64,18 @@ static int read_inode(struct inode *inode, void *data) vi->inode_isize = sizeof(struct erofs_inode_v1); vi->xattr_isize = ondisk_xattr_ibody_size(v1->i_xattr_icount); - vi->raw_blkaddr = le32_to_cpu(v1->i_u.raw_blkaddr); inode->i_mode = le16_to_cpu(v1->i_mode); + 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)); @@ -173,6 +193,12 @@ static int fill_inode(struct inode *inode, int isdir) &page_symlink_inode_operations; #endif 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)) { +#ifdef CONFIG_EROFS_FS_XATTR + inode->i_op = &erofs_special_inode_operations; +#endif + init_special_inode(inode, inode->i_mode, inode->i_rdev); } else { err = -EIO; goto out_unlock; @@ -232,6 +258,12 @@ struct inode *erofs_iget(struct super_block *sb, }; #endif +const struct inode_operations erofs_special_inode_operations = { +#ifdef CONFIG_EROFS_FS_XATTR + .listxattr = erofs_listxattr, +#endif +}; + #ifdef CONFIG_EROFS_FS_XATTR const struct inode_operations erofs_fast_symlink_xattr_iops = { .get_link = simple_get_link, diff --git a/drivers/staging/erofs/internal.h b/drivers/staging/erofs/internal.h index 8a8caf0..5862705 100644 --- a/drivers/staging/erofs/internal.h +++ b/drivers/staging/erofs/internal.h @@ -252,6 +252,7 @@ int erofs_namei(struct inode *dir, struct qstr *name, #ifdef CONFIG_EROFS_FS_XATTR extern const struct inode_operations erofs_symlink_xattr_iops; extern const struct inode_operations erofs_fast_symlink_xattr_iops; +extern const struct inode_operations erofs_special_inode_operations; #endif static inline void set_inode_fast_symlink(struct inode *inode) -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: gaoxiang25@huawei.com (Gao Xiang) Subject: [PATCH 10/25] staging: erofs: support special inode Date: Thu, 26 Jul 2018 20:21:53 +0800 [thread overview] Message-ID: <1532607728-103372-11-git-send-email-gaoxiang25@huawei.com> (raw) In-Reply-To: <1532607728-103372-1-git-send-email-gaoxiang25@huawei.com> From: Chao Yu <yuchao0@huawei.com> This patch adds to support special inode, such as block dev, char, socket, pipe inode. Reviewed-by: Gao Xiang <gaoxiang25 at huawei.com> Signed-off-by: Chao Yu <yuchao0 at huawei.com> --- drivers/staging/erofs/inode.c | 36 ++++++++++++++++++++++++++++++++++-- drivers/staging/erofs/internal.h | 1 + 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/drivers/staging/erofs/inode.c b/drivers/staging/erofs/inode.c index 15ed919..c011811 100644 --- a/drivers/staging/erofs/inode.c +++ b/drivers/staging/erofs/inode.c @@ -34,8 +34,18 @@ static int read_inode(struct inode *inode, void *data) vi->inode_isize = sizeof(struct erofs_inode_v2); vi->xattr_isize = ondisk_xattr_ibody_size(v2->i_xattr_icount); - vi->raw_blkaddr = le32_to_cpu(v2->i_u.raw_blkaddr); inode->i_mode = le16_to_cpu(v2->i_mode); + 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)); @@ -54,8 +64,18 @@ static int read_inode(struct inode *inode, void *data) vi->inode_isize = sizeof(struct erofs_inode_v1); vi->xattr_isize = ondisk_xattr_ibody_size(v1->i_xattr_icount); - vi->raw_blkaddr = le32_to_cpu(v1->i_u.raw_blkaddr); inode->i_mode = le16_to_cpu(v1->i_mode); + 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)); @@ -173,6 +193,12 @@ static int fill_inode(struct inode *inode, int isdir) &page_symlink_inode_operations; #endif 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)) { +#ifdef CONFIG_EROFS_FS_XATTR + inode->i_op = &erofs_special_inode_operations; +#endif + init_special_inode(inode, inode->i_mode, inode->i_rdev); } else { err = -EIO; goto out_unlock; @@ -232,6 +258,12 @@ struct inode *erofs_iget(struct super_block *sb, }; #endif +const struct inode_operations erofs_special_inode_operations = { +#ifdef CONFIG_EROFS_FS_XATTR + .listxattr = erofs_listxattr, +#endif +}; + #ifdef CONFIG_EROFS_FS_XATTR const struct inode_operations erofs_fast_symlink_xattr_iops = { .get_link = simple_get_link, diff --git a/drivers/staging/erofs/internal.h b/drivers/staging/erofs/internal.h index 8a8caf0..5862705 100644 --- a/drivers/staging/erofs/internal.h +++ b/drivers/staging/erofs/internal.h @@ -252,6 +252,7 @@ int erofs_namei(struct inode *dir, struct qstr *name, #ifdef CONFIG_EROFS_FS_XATTR extern const struct inode_operations erofs_symlink_xattr_iops; extern const struct inode_operations erofs_fast_symlink_xattr_iops; +extern const struct inode_operations erofs_special_inode_operations; #endif static inline void set_inode_fast_symlink(struct inode *inode) -- 1.9.1
next prev parent reply other threads:[~2018-07-26 12:25 UTC|newest] Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-31 11:06 [NOMERGE] [RFC PATCH 00/12] erofs: introduce erofs file system Gao Xiang 2018-06-01 7:48 ` Richard Weinberger 2018-06-01 9:11 ` Gao Xiang 2018-06-01 9:28 ` Richard Weinberger 2018-06-01 11:16 ` Gao Xiang 2018-06-07 10:26 ` Pavel Machek 2018-07-27 0:55 ` Joey Pabalinas 2018-07-27 0:57 ` Joey Pabalinas 2018-07-26 12:21 ` [PATCH 00/25] staging: " Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 01/25] staging: erofs: add on-disk layout Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 02/25] staging: erofs: add erofs in-memory stuffs Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 03/25] staging: erofs: add super block operations Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 04/25] staging: erofs: add raw address_space operations Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 05/25] staging: erofs: add inode operations Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 06/25] staging: erofs: add directory operations Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 07/25] staging: erofs: add namei functions Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 08/25] staging: erofs: update Kconfig and Makefile Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 09/25] staging: erofs: introduce xattr & acl support Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` Gao Xiang [this message] 2018-07-26 12:21 ` [PATCH 10/25] staging: erofs: support special inode Gao Xiang 2018-07-26 12:21 ` [PATCH 11/25] staging: erofs: introduce error injection infrastructure Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 12/25] staging: erofs: support tracepoint Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 13/25] staging: erofs: <linux/tagptr.h>: introduce tagged pointer Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 14/25] staging: erofs: introduce pagevec for unzip subsystem Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 15/25] staging: erofs: add erofs_map_blocks_iter Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:21 ` [PATCH 16/25] staging: erofs: add erofs_allocpage Gao Xiang 2018-07-26 12:21 ` Gao Xiang 2018-07-26 12:22 ` [PATCH 17/25] staging: erofs: globalize prepare_bio and __submit_bio Gao Xiang 2018-07-26 12:22 ` Gao Xiang 2018-07-26 12:22 ` [PATCH 18/25] staging: erofs: introduce a customized LZ4 decompression Gao Xiang 2018-07-26 12:22 ` Gao Xiang 2018-07-26 12:22 ` [PATCH 19/25] staging: erofs: add a generic z_erofs VLE decompressor Gao Xiang 2018-07-26 12:22 ` Gao Xiang 2018-07-26 12:22 ` [PATCH 20/25] staging: erofs: introduce superblock registration Gao Xiang 2018-07-26 12:22 ` Gao Xiang 2018-07-26 12:22 ` [PATCH 21/25] staging: erofs: introduce erofs shrinker Gao Xiang 2018-07-26 12:22 ` Gao Xiang 2018-07-26 12:22 ` [PATCH 22/25] staging: erofs: introduce workstation for decompression Gao Xiang 2018-07-26 12:22 ` Gao Xiang 2018-07-26 12:22 ` [PATCH 23/25] staging: erofs: introduce VLE decompression support Gao Xiang 2018-07-26 12:22 ` Gao Xiang 2018-07-26 12:22 ` [PATCH 24/25] staging: erofs: introduce cached decompression Gao Xiang 2018-07-26 12:22 ` Gao Xiang 2018-07-26 12:22 ` [PATCH 25/25] staging: erofs: add a TODO and update MAINTAINERS for staging Gao Xiang 2018-07-26 12:22 ` Gao Xiang 2018-07-28 7:10 ` [PATCH] staging: erofs: fix a compile warning of Z_EROFS_VLE_VMAP_ONSTACK_PAGES Gao Xiang 2018-07-28 7:10 ` Gao Xiang 2018-07-28 10:43 ` Chao Yu 2018-07-28 10:43 ` Chao Yu 2018-07-29 5:34 ` [PATCH 1/2] staging: erofs: fix compile error without built-in decompression support Gao Xiang 2018-07-29 5:34 ` Gao Xiang 2018-07-29 5:37 ` [PATCH 2/2] staging: erofs: fix conditional uninitialized `pcn' in z_erofs_map_blocks_iter Gao Xiang 2018-07-29 5:37 ` Gao Xiang 2018-07-30 1:51 ` [PATCH] staging: erofs: use the wrapped PTR_ERR_OR_ZERO instead of open code Gao Xiang 2018-07-30 1:51 ` Gao Xiang 2018-07-30 6:58 ` Chao Yu 2018-07-30 6:58 ` Chao Yu 2018-08-01 6:38 ` [PATCH 1/2] staging: erofs: add the missing break in z_erofs_map_blocks_iter Gao Xiang 2018-08-01 6:38 ` Gao Xiang 2018-08-01 6:38 ` [PATCH 2/2] staging: erofs: remove a redundant marco in xattr Gao Xiang 2018-08-01 6:38 ` Gao Xiang 2018-08-01 9:02 ` [PATCH 1/2] staging: erofs: add the missing break in z_erofs_map_blocks_iter Dan Carpenter 2018-08-01 9:02 ` Dan Carpenter 2018-08-01 9:19 ` Gao Xiang 2018-08-01 9:19 ` Gao Xiang 2018-08-01 9:36 ` [PATCH RESEND " Gao Xiang 2018-08-01 9:36 ` Gao Xiang 2018-08-01 11:36 ` Dan Carpenter 2018-08-01 11:36 ` Dan Carpenter 2018-08-01 12:08 ` Gao Xiang 2018-08-01 12:08 ` Gao Xiang 2018-07-30 2:07 ` [PATCH 2/2] staging: erofs: fix conditional uninitialized `pcn' " Chao Yu 2018-07-30 2:07 ` Chao Yu 2018-07-30 2:07 ` [PATCH 1/2] staging: erofs: fix compile error without built-in decompression support Chao Yu 2018-07-30 2:07 ` Chao Yu 2018-07-30 2:32 ` Gao Xiang 2018-07-30 2:32 ` Gao Xiang 2018-07-30 3:07 ` Chao Yu 2018-07-30 3:07 ` Chao Yu 2018-07-30 3:55 ` Gao Xiang 2018-07-30 3:55 ` Gao Xiang 2018-07-30 3:34 ` [FOR INTERNAL REVIEW] [PATCH RESEND 1/3] staging: erofs: fix incorrect code in erofs_shrink_scan Gao Xiang 2018-07-30 3:34 ` [FOR INTERNAL REVIEW] [PATCH RESEND 2/3] staging: erofs: add 'erofs_' prefixes for try_to_free_(all_)cached_page(s) Gao Xiang 2018-07-30 6:57 ` Chao Yu 2018-07-30 3:34 ` [FOR INTERNAL REVIEW] [PATCH RESEND 3/3] staging: erofs: fix conditional uninitialized `pcn' in z_erofs_map_blocks_iter Gao Xiang 2018-07-30 6:56 ` [FOR INTERNAL REVIEW] [PATCH RESEND 1/3] staging: erofs: fix incorrect code in erofs_shrink_scan Chao Yu 2018-07-27 0:25 ` [PATCH 00/25] staging: erofs: introduce erofs file system Christian Kujau 2018-07-27 1:39 ` Gao Xiang 2018-07-27 1:39 ` Gao Xiang 2018-07-27 1:56 ` Gao Xiang 2018-07-27 1:56 ` Gao Xiang 2018-07-28 7:25 ` Greg Kroah-Hartman 2018-07-28 7:25 ` Greg Kroah-Hartman 2018-07-28 9:33 ` Gao Xiang 2018-07-28 9:33 ` Gao Xiang 2018-07-28 10:34 ` Chao Yu 2018-07-28 10:34 ` Chao Yu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1532607728-103372-11-git-send-email-gaoxiang25@huawei.com \ --to=gaoxiang25@huawei.com \ --cc=chao@kernel.org \ --cc=devel@driverdev.osuosl.org \ --cc=gregkh@linuxfoundation.org \ --cc=hsiangkao@aol.com \ --cc=linux-erofs@lists.ozlabs.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=miaoxie@huawei.com \ --cc=weidu.du@huawei.com \ --cc=yuchao0@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.