feat: fstat now handle symbolic link

[lunaix-os.git] / lunaix-os / kernel / fs / vfs.c

diff --git a/lunaix-os/kernel/fs/vfs.c b/lunaix-os/kernel/fs/vfs.c
index e436eba969c1fea7e88a863adf9e518e579b7514..cf376d23f132ad5e3dd56d368da195e54e317f2d 100644 (file)
--- a/lunaix-os/kernel/fs/vfs.c
+++ b/lunaix-os/kernel/fs/vfs.c
@@ -40,7 +40,7 @@
                     we can do similar thing in Lunaix? A block device emulation
                     above the regular file when we mount it on.
  10. (device) device number (dev_t) allocation
                     we can do similar thing in Lunaix? A block device emulation
                     above the regular file when we mount it on.
  10. (device) device number (dev_t) allocation

-            [good idea] <class>:<subclass>:<uniq_id> composition
+            [good idea] <class>:<subclass>:<uniq_id> composition (CHECKED)

 */
 
 #include <klibc/string.h>
 */
 
 #include <klibc/string.h>


@@ -56,7 +56,7 @@
 
 #include <lunaix/fs/twifs.h>
 
 
 #include <lunaix/fs/twifs.h>
 

-#include <usr/sys/dirent_defs.h>
+#include <usr/lunaix/dirent_defs.h>

 
 static struct cake_pile* dnode_pile;
 static struct cake_pile* inode_pile;
 
 static struct cake_pile* dnode_pile;
 static struct cake_pile* inode_pile;


@@ -110,7 +110,7 @@ vfs_init()
     atomic_fetch_add(&vfs_sysroot->ref_count, 1);
 }
 
     atomic_fetch_add(&vfs_sysroot->ref_count, 1);
 }
 

-inline struct hbucket*
+static inline struct hbucket*

 __dcache_hash(struct v_dnode* parent, u32_t* hash)
 {
     u32_t _hash = *hash;
 __dcache_hash(struct v_dnode* parent, u32_t* hash)
 {
     u32_t _hash = *hash;


@@ -201,7 +201,7 @@ vfs_open(struct v_dnode* dnode, struct v_file** file)
     vfile->ref_count = ATOMIC_VAR_INIT(1);
     vfile->ops = inode->default_fops;
 
     vfile->ref_count = ATOMIC_VAR_INIT(1);
     vfile->ops = inode->default_fops;
 

-    if ((inode->itype & VFS_IFFILE) && !inode->pg_cache) {
+    if ((inode->itype & F_MFILE) && !inode->pg_cache) {

         struct pcache* pcache = vzalloc(sizeof(struct pcache));
         pcache_init(pcache);
         pcache->master = inode;
         struct pcache* pcache = vzalloc(sizeof(struct pcache));
         pcache_init(pcache);
         pcache->master = inode;


@@ -436,7 +436,7 @@ vfs_d_free(struct v_dnode* dnode)
         vfs_dcache_remove(pos);
     }
 
         vfs_dcache_remove(pos);
     }
 

-    vfree(dnode->name.value);
+    vfree((void*)dnode->name.value);

     cake_release(dnode_pile, dnode);
 }
 
     cake_release(dnode_pile, dnode);
 }
 


@@ -490,7 +490,6 @@ vfs_i_alloc(struct v_superblock* sb)
     inode->atime = inode->ctime;
     inode->mtime = inode->ctime;
 
     inode->atime = inode->ctime;
     inode->mtime = inode->ctime;
 

-done:

     lru_use_one(inode_lru, &inode->lru);
     return inode;
 }
     lru_use_one(inode_lru, &inode->lru);
     return inode;
 }


@@ -515,6 +514,8 @@ vfs_i_free(struct v_inode* inode)
 /* ---- System call definition and support ---- */
 
 #define FLOCATE_CREATE_EMPTY 1
 /* ---- System call definition and support ---- */
 
 #define FLOCATE_CREATE_EMPTY 1

+#define FLOCATE_CREATE_ONLY 2
+#define FLOCATE_NOFOLLOW 4

 
 int
 vfs_getfd(int fd, struct v_fd** fd_s)
 
 int
 vfs_getfd(int fd, struct v_fd** fd_s)


@@ -533,15 +534,25 @@ __vfs_try_locate_file(const char* path,
 {
     char name_str[VFS_NAME_MAXLEN];
     struct hstr name = HSTR(name_str, 0);
 {
     char name_str[VFS_NAME_MAXLEN];
     struct hstr name = HSTR(name_str, 0);

-    int errno;
+    int errno, woption = 0;
+
+    if ((options & FLOCATE_NOFOLLOW)) {
+        woption |= VFS_WALK_NOFOLLOW;
+    }

 
     name_str[0] = 0;
 
     name_str[0] = 0;

-    if ((errno = vfs_walk_proc(path, fdir, &name, VFS_WALK_PARENT))) {
+    if ((errno = vfs_walk_proc(path, fdir, &name, woption | VFS_WALK_PARENT))) {

         return errno;
     }
 
         return errno;
     }
 

-    errno = vfs_walk(*fdir, name.value, file, NULL, 0);
-    if (errno != ENOENT || !(options & FLOCATE_CREATE_EMPTY)) {
+    errno = vfs_walk(*fdir, name.value, file, NULL, woption);
+
+    if (errno != ENOENT && (options & FLOCATE_CREATE_ONLY)) {
+        return EEXIST;
+    }
+
+    if (errno != ENOENT ||
+        !(options & (FLOCATE_CREATE_EMPTY | FLOCATE_CREATE_ONLY))) {

         return errno;
     }
 
         return errno;
     }
 


@@ -569,12 +580,17 @@ __vfs_try_locate_file(const char* path,
 int
 vfs_do_open(const char* path, int options)
 {
 int
 vfs_do_open(const char* path, int options)
 {

-    int errno, fd;
+    int errno, fd, loptions = 0;

     struct v_dnode *dentry, *file;
     struct v_file* ofile = NULL;
 
     struct v_dnode *dentry, *file;
     struct v_file* ofile = NULL;
 

-    errno = __vfs_try_locate_file(
-      path, &dentry, &file, (options & FO_CREATE) ? FLOCATE_CREATE_EMPTY : 0);
+    if ((options & FO_CREATE)) {
+        loptions |= FLOCATE_CREATE_EMPTY;
+    } else if ((options & FO_NOFOLLOW)) {
+        loptions |= FLOCATE_NOFOLLOW;
+    }
+
+    errno = __vfs_try_locate_file(path, &dentry, &file, loptions);

 
     if (!errno && !(errno = vfs_alloc_fdslot(&fd))) {
 
 
     if (!errno && !(errno = vfs_alloc_fdslot(&fd))) {
 


@@ -645,7 +661,7 @@ __DEFINE_LXSYSCALL2(int, sys_readdir, int, fd, struct lx_dirent*, dent)
 
     lock_inode(inode);
 
 
     lock_inode(inode);
 

-    if (!(inode->itype & VFS_IFDIR)) {
+    if ((inode->itype & F_FILE)) {

         errno = ENOTDIR;
     } else {
         struct dir_context dctx =
         errno = ENOTDIR;
     } else {
         struct dir_context dctx =


@@ -683,7 +699,7 @@ __DEFINE_LXSYSCALL3(int, read, int, fd, void*, buf, size_t, count)
     }
 
     struct v_file* file = fd_s->file;
     }
 
     struct v_file* file = fd_s->file;

-    if ((file->inode->itype & VFS_IFDIR)) {
+    if (!(file->inode->itype & F_FILE)) {

         errno = EISDIR;
         goto done;
     }
         errno = EISDIR;
         goto done;
     }


@@ -724,7 +740,7 @@ __DEFINE_LXSYSCALL3(int, write, int, fd, void*, buf, size_t, count)
         goto done;
     }
 
         goto done;
     }
 

-    if ((file->inode->itype & VFS_IFDIR)) {
+    if (!(file->inode->itype & F_FILE)) {

         errno = EISDIR;
         goto done;
     }
         errno = EISDIR;
         goto done;
     }


@@ -846,13 +862,12 @@ vfs_readlink(struct v_dnode* dnode, char* buf, size_t size)
 int
 vfs_get_dtype(int itype)
 {
 int
 vfs_get_dtype(int itype)
 {

-    switch (itype) {
-        case VFS_IFDIR:
-            return DT_DIR;
-        case VFS_IFSYMLINK:
-            return DT_SYMLINK;
-        default:
-            return DT_PIPE;
+    if ((itype & VFS_IFSYMLINK)) {
+        return DT_SYMLINK;
+    } else if (!(itype & VFS_IFFILE)) {
+        return DT_DIR;
+    } else {
+        return DT_FILE;

     }
 }
 
     }
 }
 


@@ -907,6 +922,8 @@ __DEFINE_LXSYSCALL4(int,
         goto done;
     }
 
         goto done;
     }
 

+    pathname = pathname ? pathname : "";
+

     struct v_dnode* dnode;
     if (!(errno = vfs_walk(
             fd_s->file->dnode, pathname, &dnode, NULL, VFS_WALK_NOFOLLOW))) {
     struct v_dnode* dnode;
     if (!(errno = vfs_walk(
             fd_s->file->dnode, pathname, &dnode, NULL, VFS_WALK_NOFOLLOW))) {


@@ -968,7 +985,7 @@ __DEFINE_LXSYSCALL1(int, rmdir, const char*, pathname)
     lock_dnode(parent);
     lock_inode(parent->inode);
 
     lock_dnode(parent);
     lock_inode(parent->inode);
 

-    if ((dnode->inode->itype & VFS_IFDIR)) {
+    if (!(dnode->inode->itype & F_MFILE)) {

         errno = parent->inode->ops->rmdir(parent->inode, dnode);
         if (!errno) {
             vfs_dcache_remove(dnode);
         errno = parent->inode->ops->rmdir(parent->inode, dnode);
         if (!errno) {
             vfs_dcache_remove(dnode);


@@ -1012,7 +1029,7 @@ __DEFINE_LXSYSCALL1(int, mkdir, const char*, path)
         errno = ENOTSUP;
     } else if (!parent->inode->ops->mkdir) {
         errno = ENOTSUP;
         errno = ENOTSUP;
     } else if (!parent->inode->ops->mkdir) {
         errno = ENOTSUP;

-    } else if (!(parent->inode->itype & VFS_IFDIR)) {
+    } else if ((parent->inode->itype & F_FILE)) {

         errno = ENOTDIR;
     } else if (!(errno = parent->inode->ops->mkdir(parent->inode, dir))) {
         vfs_dcache_add(parent, dir);
         errno = ENOTDIR;
     } else if (!(errno = parent->inode->ops->mkdir(parent->inode, dir))) {
         vfs_dcache_add(parent, dir);


@@ -1046,9 +1063,7 @@ __vfs_do_unlink(struct v_dnode* dnode)
 
     if (inode->open_count) {
         errno = EBUSY;
 
     if (inode->open_count) {
         errno = EBUSY;

-    } else if (!(inode->itype & VFS_IFDIR)) {
-        // The underlying unlink implementation should handle
-        //  symlink case
+    } else if ((inode->itype & F_MFILE)) {

         errno = inode->ops->unlink(inode);
         if (!errno) {
             vfs_d_free(dnode);
         errno = inode->ops->unlink(inode);
         if (!errno) {
             vfs_d_free(dnode);


@@ -1101,10 +1116,8 @@ __DEFINE_LXSYSCALL2(int, link, const char*, oldpath, const char*, newpath)
     errno = __vfs_try_locate_file(oldpath, &dentry, &to_link, 0);
     if (!errno) {
         errno = __vfs_try_locate_file(
     errno = __vfs_try_locate_file(oldpath, &dentry, &to_link, 0);
     if (!errno) {
         errno = __vfs_try_locate_file(

-          newpath, &name_dentry, &name_file, FLOCATE_CREATE_EMPTY);
+          newpath, &name_dentry, &name_file, FLOCATE_CREATE_ONLY);

         if (!errno) {
         if (!errno) {

-            errno = EEXIST;
-        } else if (name_file) {

             errno = vfs_link(to_link, name_file);
         }
     }
             errno = vfs_link(to_link, name_file);
         }
     }


@@ -1201,30 +1214,37 @@ __DEFINE_LXSYSCALL2(int,
                     link_target)
 {
     int errno;
                     link_target)
 {
     int errno;

-    struct v_dnode* dnode;
-    if ((errno = vfs_walk_proc(pathname, &dnode, NULL, 0))) {
+    struct v_dnode *dnode, *file;
+    if ((errno = __vfs_try_locate_file(
+           pathname, &dnode, &file, FLOCATE_CREATE_ONLY))) {

         goto done;
     }
 
         goto done;
     }
 

-    if (errno = vfs_check_writable(dnode)) {
+    if ((errno = vfs_check_writable(file))) {

         goto done;
     }
 
         goto done;
     }
 

-    if (!dnode->inode->ops->set_symlink) {
+    if (!file->inode->ops->set_symlink) {

         errno = ENOTSUP;
         goto done;
     }
 
         errno = ENOTSUP;
         goto done;
     }
 

-    lock_inode(dnode->inode);
+    lock_inode(file->inode);

 
 

-    errno = dnode->inode->ops->set_symlink(dnode->inode, link_target);
+    errno = file->inode->ops->set_symlink(file->inode, link_target);

 
 

-    unlock_inode(dnode->inode);
+    unlock_inode(file->inode);

 
 done:
     return DO_STATUS(errno);
 }
 
 
 done:
     return DO_STATUS(errno);
 }
 

+void
+vfs_ref_file(struct v_file* file)
+{
+    atomic_fetch_add(&file->ref_count, 1);
+}
+

 void
 vfs_ref_dnode(struct v_dnode* dnode)
 {
 void
 vfs_ref_dnode(struct v_dnode* dnode)
 {


@@ -1246,7 +1266,7 @@ vfs_do_chdir(struct proc_info* proc, struct v_dnode* dnode)
 
     lock_dnode(dnode);
 
 
     lock_dnode(dnode);
 

-    if (!(dnode->inode->itype & VFS_IFDIR)) {
+    if ((dnode->inode->itype & F_FILE)) {

         errno = ENOTDIR;
         goto done;
     }
         errno = ENOTDIR;
         goto done;
     }


@@ -1273,7 +1293,7 @@ __DEFINE_LXSYSCALL1(int, chdir, const char*, path)
         goto done;
     }
 
         goto done;
     }
 

-    errno = vfs_do_chdir(__current, dnode);
+    errno = vfs_do_chdir((struct proc_info*)__current, dnode);

 
 done:
     return DO_STATUS(errno);
 
 done:
     return DO_STATUS(errno);


@@ -1288,7 +1308,7 @@ __DEFINE_LXSYSCALL1(int, fchdir, int, fd)
         goto done;
     }
 
         goto done;
     }
 

-    errno = vfs_do_chdir(__current, fd_s->file->dnode);
+    errno = vfs_do_chdir((struct proc_info*)__current, fd_s->file->dnode);

 
 done:
     return DO_STATUS(errno);
 
 done:
     return DO_STATUS(errno);


@@ -1316,7 +1336,7 @@ __DEFINE_LXSYSCALL2(char*, getcwd, char*, buf, size_t, size)
         }
     }
 
         }
     }
 

-    buf[len + 1] = '\0';
+    buf[len] = '\0';

 
     ret_ptr = buf;
 
 
     ret_ptr = buf;
 


@@ -1334,7 +1354,7 @@ vfs_do_rename(struct v_dnode* current, struct v_dnode* target)
         return 0;
     }
 
         return 0;
     }
 

-    if (errno = vfs_check_writable(current)) {
+    if ((errno = vfs_check_writable(current))) {

         return errno;
     }
 
         return errno;
     }
 


@@ -1418,6 +1438,48 @@ __DEFINE_LXSYSCALL2(int, rename, const char*, oldpath, const char*, newpath)
     errno = vfs_do_rename(cur, target);
 
 done:
     errno = vfs_do_rename(cur, target);
 
 done:

-    vfree(name.value);
+    vfree((void*)name.value);
+    return DO_STATUS(errno);
+}
+
+__DEFINE_LXSYSCALL2(int, fstat, int, fd, struct file_stat*, stat)
+{
+    int errno = 0;
+    struct v_fd* fds;
+
+    if ((errno = vfs_getfd(fd, &fds))) {
+        goto done;
+    }
+
+    struct v_inode* vino = fds->file->inode;
+    struct device* fdev = vino->sb->dev;
+
+    *stat = (struct file_stat){ .st_ino = vino->id,
+                                .st_blocks = vino->lb_usage,
+                                .st_size = vino->fsize,
+                                .mode = vino->itype,
+                                .st_ioblksize = PG_SIZE,
+                                .st_blksize = vino->sb->blksize };
+
+    if (VFS_DEVFILE(vino->itype)) {
+        struct device* rdev = (struct device*)vino->data;
+        if (!rdev || rdev->magic != DEV_STRUCT_MAGIC) {
+            errno = EINVAL;
+            goto done;
+        }
+
+        stat->st_rdev = (dev_t){ .meta = rdev->class->meta,
+                                 .devident = device_id_from_class(rdev->class),
+                                 .dev_uid = rdev->dev_uid };
+    }
+
+    if (fdev) {
+        u32_t devident = device_id_from_class(fdev->class);
+        stat->st_dev = (dev_t){ .meta = fdev->class->meta,
+                                .devident = devident,
+                                .dev_uid = fdev->dev_uid };
+    }
+
+done:

     return DO_STATUS(errno);
 }
\ No newline at end of file
     return DO_STATUS(errno);
 }
\ No newline at end of file