VFS updates, readme updates.

Separated vfs file as a specific file. vm file is not always a vfs file.
Updated the README
sys_open was not returning back to client, added that.
Added comments for future vfs additions.

tasks/fs0/src/syscalls.c

@@ -92,10 +92,13 @@ int sys_open(l4id_t sender, const char *pathname, int flags, unsigned int mode)
 	/* Get the vnode */
 	if (IS_ERR(v = vfs_lookup_bypath(task, pathbuf))) {
 		if (!(flags & O_CREAT)) {
-			return (int)v;
+			l4_ipc_return((int)v);
+			return 0;
 		} else {
-			if ((err = vfs_create(task, pathname, mode)) < 0)
-				return err;
+			if ((err = vfs_create(task, pathname, mode)) < 0) {
+				l4_ipc_return(err);
+				return 0;
+			}
 		}
 	}
 
@@ -108,6 +111,7 @@ int sys_open(l4id_t sender, const char *pathname, int flags, unsigned int mode)
 	/* Tell the pager about opened vnode information */
 	BUG_ON(pager_sys_open(sender, fd, v->vnum, v->size) < 0);
 
+	l4_ipc_return(0);
 	return 0;
 }
 
@@ -202,6 +206,26 @@ int pager_sys_write(l4id_t sender, unsigned long vnum, unsigned long f_offset,
 	return 0;
 }
 
+/*
+ * FIXME: Here's how this should have been:
+ * v->ops.readdir() -> Reads fs-specific directory contents. i.e. reads
+ * the directory buffer, doesn't care however contained vnode details are
+ * stored.
+ *
+ * After reading, it converts the fs-spceific contents into generic vfs
+ * dentries and populates the dentries of those vnodes.
+ *
+ * If vfs_readdir() is issued, those generic dentries are converted into
+ * the posix-defined directory record structure. During this on-the-fly
+ * generation, pseudo-entries such as . and .. are also added.
+ *
+ * If this layering is not done, i.e. the low-level dentry buffer already
+ * keeps this record structure and we try to return that, then we wont
+ * have a chance to add the pseudo-entries . and .. These record entries
+ * are essentially created from parent vnode and current vnode but using
+ * the names . and ..
+ */
+
 /*
  * Reads @count bytes of posix struct dirents into @buf. This implements
  * the raw dirent read syscall upon which readdir() etc. posix calls
@@ -219,19 +243,25 @@ int sys_readdir(l4id_t sender, int fd, void *buf, int count)
 	BUG_ON(!(t = find_task(sender)));
 
 	/* Convert fd to vnum. */
-	BUG_ON(!(vnum = t->fd[fd]));
+	BUG_ON((vnum = t->fd[fd]) < 0);
 
 	/* Lookup vnode */
-	if (!(v = vfs_lookup_byvnum(vfs_root.pivot->sb, vnum)))
-		return -EINVAL; /* No such vnode */
+	if (!(v = vfs_lookup_byvnum(vfs_root.pivot->sb, vnum))) {
+		l4_ipc_return(-EINVAL);
+		return 0; /* No such vnode */
+	}
 
 	/* Ensure vnode is a directory */
-	if (!vfs_isdir(v))
-		return -ENOTDIR;
+	if (!vfs_isdir(v)) {
+		l4_ipc_return(-ENOTDIR);
+		return 0;
+	}
 
 	/* Read the whole content from fs, if haven't done so yet */
-	if ((err = v->ops.readdir(v)) < 0)
-		return err;
+	if ((err = v->ops.readdir(v)) < 0) {
+		l4_ipc_return(err);
+		return 0;
+	}
 
 	/* Bytes to read, minimum of vnode size and count requested */
 	nbytes = (v->size <= count) ? v->size : count;
@@ -239,7 +269,7 @@ int sys_readdir(l4id_t sender, int fd, void *buf, int count)
 	/* Do we have those bytes at hand? */
 	if (v->dirbuf.buffer && (v->dirbuf.npages * PAGE_SIZE) >= nbytes) {
 		memcpy(buf, v->dirbuf.buffer, nbytes);
-		return nbytes;
+		l4_ipc_return(nbytes);
 	}
 
 	return 0;

tasks/fs0/src/task.c

@@ -141,8 +141,8 @@ int task_utcb_attach(struct tcb *t)
 	if ((unsigned long)shmaddr != t->utcb_address)
 		return -EINVAL;
 
-	printf("%s: Mapped utcb of task %d @ 0x%x\n",
-	       __TASKNAME__, t->tid, shmaddr);
+	//printf("%s: Mapped utcb of task %d @ 0x%x\n",
+	//       __TASKNAME__, t->tid, shmaddr);
 
 	return 0;
 
@@ -170,9 +170,9 @@ int init_task_structs(struct task_data_head *tdata_head)
 		t->curdir = vfs_root.pivot;
 
 		/* Print task information */
-		printf("%s: Task info received from mm0:\n", __TASKNAME__);
-		printf("%s: task id: %d, utcb address: 0x%x\n",
-		       __TASKNAME__, t->tid, t->utcb_address);
+		//printf("%s: Task info received from mm0:\n", __TASKNAME__);
+		//printf("%s: task id: %d, utcb address: 0x%x\n",
+		//       __TASKNAME__, t->tid, t->utcb_address);
 
 		/* shm attach to the utcbs for all these tasks except own */
 		if (t->tid != self_tid())

tasks/mm0/include/file.h

@@ -2,6 +2,7 @@
 #define __MM0_FILE_H__
 
 #include <l4/lib/list.h>
+#include <l4lib/types.h>
 #include <posix/sys/types.h>
 
 void vmfile_init(void);
@@ -17,6 +18,15 @@ int sys_read(l4id_t sender, int fd, void *buf, int count);
 int sys_write(l4id_t sender, int fd, void *buf, int count);
 int sys_lseek(l4id_t sender, int fd, off_t offset, int whence);
 
-#define vm_file_to_vnum(f)	(*(unsigned long *)((f)->priv_data))
+struct vfs_file_data {
+	unsigned long vnum;
+};
+
+#define vm_file_to_vnum(f)	\
+	(((struct vfs_file_data *)((f)->priv_data))->vnum)
+struct vm_file *vfs_file_create(void);
+
+
 extern struct list_head vm_file_list;
+
 #endif /* __MM0_FILE_H__ */

tasks/mm0/include/vm_area.h

@@ -40,7 +40,7 @@
 /* Defines the type of file. A device file? Regular file? One used at boot? */
 enum VM_FILE_TYPE {
 	VM_FILE_DEVZERO = 1,
-	VM_FILE_REGULAR,
+	VM_FILE_VFS,
 	VM_FILE_BOOTFILE,
 	VM_FILE_SHM,
 };

tasks/mm0/src/file.c

@@ -93,7 +93,9 @@ int vfs_receive_sys_open(l4id_t sender, l4id_t opener, int fd,
 
 	/* Check if that vm_file is already in the list */
 	list_for_each_entry(vmfile, &vm_file_list, list) {
-		if (vm_file_to_vnum(vmfile) == vnum) {
+		/* Check it is a vfs file and if so vnums match. */
+		if ((vmfile->type & VM_FILE_VFS) &&
+		    vm_file_to_vnum(vmfile) == vnum) {
 			/* Add a reference to it from the task */
 			t->fd[fd].vmfile = vmfile;
 			vmfile->vm_obj.refcnt++;
@@ -102,7 +104,7 @@ int vfs_receive_sys_open(l4id_t sender, l4id_t opener, int fd,
 	}
 
 	/* Otherwise allocate a new one for this vnode */
-	if (IS_ERR(vmfile = vm_file_create()))
+	if (IS_ERR(vmfile = vfs_file_create()))
 		return (int)vmfile;
 
 	/* Initialise and add it to global list */

tasks/mm0/src/vm_object.c

@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2008 Bahadir Balban
  */
+#include <file.h>
 #include <vm_area.h>
 #include <l4/macros.h>
 #include <l4/api/errno.h>
@@ -40,7 +41,7 @@ void vm_object_print(struct vm_object *vmo)
 			ftype = "bootfile";
 		else if (f->type == VM_FILE_SHM)
 			ftype = "shm file";
-		else if (f->type == VM_FILE_REGULAR)
+		else if (f->type == VM_FILE_VFS)
 			ftype = "regular";
 		else
 			BUG();
@@ -91,6 +92,23 @@ struct vm_file *vm_file_create(void)
 	return f;
 }
 
+/*
+ * Populates the priv_data with vfs-file-specific
+ * information.
+ */
+struct vm_file *vfs_file_create(void)
+{
+	struct vm_file *f = vm_file_create();
+
+	if (IS_ERR(f))
+		return f;
+
+	f->priv_data = kzalloc(sizeof(struct vfs_file_data));
+	f->type = VM_FILE_VFS;
+
+	return f;
+}
+
 /* Deletes the object via its base, along with all its pages */
 int vm_object_delete(struct vm_object *vmo)
 {

tasks/test0/src/dirtest.c

@@ -113,14 +113,15 @@ int lsdir(char *path)
 		perror("OPEN");
 		return 0;
 	} else
-		// printf("OPEN OK.\n");
+		printf("OPEN OK.\n");
 
 	if ((bytes = os_readdir(fd, dents, sizeof(struct dirent) * DENTS_TOTAL)) < 0) {
 		perror("GETDENTS");
 		return 0;
-	}
-		//printf("GETDENTS OK.\n");
+	} else {
+		printf("GETDENTS OK.\n");
 		print_dirents(path, dents, bytes);
+	}
 
 	return 0;
 }