diff options
| author | Huang Jianan <huangjianan@oppo.com> | 2020-11-27 19:46:16 +0800 |
|---|---|---|
| committer | Gao Xiang <hsiangkao@aol.com> | 2020-11-27 21:21:51 +0800 |
| commit | 73ffe6cb514f70ea6904a05564efc60d5be60ada (patch) | |
| tree | 4839e4852628a3fb202120bef42d0531d5d000c1 | |
| parent | 5e35b75ad4992ae69f3ff6adfb21f8b7ad9f6fe9 (diff) | |
| download | erofs-utils-73ffe6cb514f70ea6904a05564efc60d5be60ada.tar.gz | |
erofs-utils: fuse: support symlink & special inode
This patch adds symlink and special inode (e.g. block dev, char,
socket, pipe inode) support.
Link: https://lore.kernel.org/r/20201127114617.13055-3-hsiangkao@aol.com
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
Signed-off-by: Guo Weichao <guoweichao@oppo.com>
Signed-off-by: Gao Xiang <hsiangkao@aol.com>
| -rw-r--r-- | fuse/main.c | 10 | ||||
| -rw-r--r-- | lib/namei.c | 22 |
2 files changed, 28 insertions, 4 deletions
diff --git a/fuse/main.c b/fuse/main.c index ab8a90a..1e24efe 100644 --- a/fuse/main.c +++ b/fuse/main.c @@ -78,7 +78,17 @@ static int erofsfuse_read(const char *path, char *buffer, return size; } +static int erofsfuse_readlink(const char *path, char *buffer, size_t size) +{ + int ret = erofsfuse_read(path, buffer, size, 0, NULL); + + if (ret < 0) + return ret; + return 0; +} + static struct fuse_operations erofs_ops = { + .readlink = erofsfuse_readlink, .getattr = erofsfuse_getattr, .readdir = erofsfuse_readdir, .open = erofsfuse_open, diff --git a/lib/namei.c b/lib/namei.c index b05f5c4..e8275a4 100644 --- a/lib/namei.c +++ b/lib/namei.c @@ -15,6 +15,14 @@ #include "erofs/print.h" #include "erofs/io.h" +static dev_t erofs_new_decode_dev(u32 dev) +{ + const unsigned int major = (dev & 0xfff00) >> 8; + const unsigned int minor = (dev & 0xff) | ((dev >> 12) & 0xfff00); + + return makedev(major, minor); +} + static int erofs_read_inode_from_disk(struct erofs_inode *vi) { int ret, ifmt; @@ -57,10 +65,13 @@ static int erofs_read_inode_from_disk(struct erofs_inode *vi) break; case S_IFCHR: case S_IFBLK: - return -EOPNOTSUPP; + vi->u.i_rdev = + erofs_new_decode_dev(le32_to_cpu(die->i_u.rdev)); + break; case S_IFIFO: case S_IFSOCK: - return -EOPNOTSUPP; + vi->u.i_rdev = 0; + break; default: goto bogusimode; } @@ -86,10 +97,13 @@ static int erofs_read_inode_from_disk(struct erofs_inode *vi) break; case S_IFCHR: case S_IFBLK: - return -EOPNOTSUPP; + vi->u.i_rdev = + erofs_new_decode_dev(le32_to_cpu(dic->i_u.rdev)); + break; case S_IFIFO: case S_IFSOCK: - return -EOPNOTSUPP; + vi->u.i_rdev = 0; + break; default: goto bogusimode; } |