9p: Reorganization of 9p file system code

This patchset moves non-filesystem interfaces of v9fs from fs/9p to net/9p.
It moves the transport, packet marshalling and connection layers to net/9p
leaving only the VFS related files in fs/9p.  This work is being done in
preparation for in-kernel 9p servers as well as alternate 9p clients (other
than VFS).

Signed-off-by: Latchesar Ionkov <lucho@ionkov.net>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

1 files changed, 54 insertions, 114 deletions

diff --git a/fs/9p/fid.c b/fs/9p/fid.c
index 90419715c7e9..08fa320b7e6d 100644
--- a/fs/9p/fid.c
+++ b/fs/9p/fid.c
@@ -26,10 +26,10 @@
 #include <linux/sched.h>
 #include <linux/idr.h>
 #include <asm/semaphore.h>
+#include <net/9p/9p.h>
+#include <net/9p/client.h>
 
-#include "debug.h"
 #include "v9fs.h"
-#include "9p.h"
 #include "v9fs_vfs.h"
 #include "fid.h"
 
@@ -40,67 +40,29 @@
  *
  */
 
-int v9fs_fid_insert(struct v9fs_fid *fid, struct dentry *dentry)
+int v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid)
 {
-        struct list_head *fid_list = (struct list_head *)dentry->d_fsdata;
-        dprintk(DEBUG_9P, "fid %d (%p) dentry %s (%p)\n", fid->fid, fid,
-                dentry->d_iname, dentry);
-        if (dentry->d_fsdata == NULL) {
-                dentry->d_fsdata =
-                    kmalloc(sizeof(struct list_head), GFP_KERNEL);
-                if (dentry->d_fsdata == NULL) {
-                        dprintk(DEBUG_ERROR, "Out of memory\n");
-                        return -ENOMEM;
-                }
-                fid_list = (struct list_head *)dentry->d_fsdata;
-                INIT_LIST_HEAD(fid_list);       /* Initialize list head */
-        }
+        struct v9fs_dentry *dent;
 
-        fid->uid = current->uid;
-        list_add(&fid->list, fid_list);
-        return 0;
-}
+        P9_DPRINTK(P9_DEBUG_VFS, "fid %d dentry %s\n",
+                                        fid->fid, dentry->d_iname);
 
-/**
- * v9fs_fid_create - allocate a FID structure
- * @dentry - dentry to link newly created fid to
- *
- */
-
-struct v9fs_fid *v9fs_fid_create(struct v9fs_session_info *v9ses, int fid)
-{
-        struct v9fs_fid *new;
+        dent = dentry->d_fsdata;
+        if (!dent) {
+                dent = kmalloc(sizeof(struct v9fs_dentry), GFP_KERNEL);
+                if (!dent)
+                        return -ENOMEM;
 
-        dprintk(DEBUG_9P, "fid create fid %d\n", fid);
-        new = kmalloc(sizeof(struct v9fs_fid), GFP_KERNEL);
-        if (new == NULL) {
-                dprintk(DEBUG_ERROR, "Out of Memory\n");
-                return ERR_PTR(-ENOMEM);
+                spin_lock_init(&dent->lock);
+                INIT_LIST_HEAD(&dent->fidlist);
+                dentry->d_fsdata = dent;
         }
 
-        new->fid = fid;
-        new->v9ses = v9ses;
-        new->fidopen = 0;
-        new->fidclunked = 0;
-        new->iounit = 0;
-        new->rdir_pos = 0;
-        new->rdir_fcall = NULL;
-        init_MUTEX(&new->lock);
-        INIT_LIST_HEAD(&new->list);
-
-        return new;
-}
-
-/**
- * v9fs_fid_destroy - deallocate a FID structure
- * @fid: fid to destroy
- *
- */
+        spin_lock(&dent->lock);
+        list_add(&fid->dlist, &dent->fidlist);
+        spin_unlock(&dent->lock);
 
-void v9fs_fid_destroy(struct v9fs_fid *fid)
-{
-        list_del(&fid->list);
-        kfree(fid);
+        return 0;
 }
 
 /**
@@ -114,30 +76,42 @@ void v9fs_fid_destroy(struct v9fs_fid *fid)
  *
  */
 
-struct v9fs_fid *v9fs_fid_lookup(struct dentry *dentry)
+struct p9_fid *v9fs_fid_lookup(struct dentry *dentry)
 {
-        struct list_head *fid_list = (struct list_head *)dentry->d_fsdata;
-        struct v9fs_fid *return_fid = NULL;
-
-        dprintk(DEBUG_9P, " dentry: %s (%p)\n", dentry->d_iname, dentry);
-
-        if (fid_list)
-                return_fid = list_entry(fid_list->next, struct v9fs_fid, list);
+        struct v9fs_dentry *dent;
+        struct p9_fid *fid;
+
+        P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry);
+        dent = dentry->d_fsdata;
+        if (dent)
+                fid = list_entry(dent->fidlist.next, struct p9_fid, dlist);
+        else
+                fid = ERR_PTR(-EBADF);
+
+        P9_DPRINTK(P9_DEBUG_VFS, " fid: %p\n", fid);
+        return fid;
+}
 
-        if (!return_fid) {
-                dprintk(DEBUG_ERROR, "Couldn't find a fid in dentry\n");
-                return_fid = ERR_PTR(-EBADF);
+struct p9_fid *v9fs_fid_lookup_remove(struct dentry *dentry)
+{
+        struct p9_fid *fid;
+        struct v9fs_dentry *dent;
+
+        dent = dentry->d_fsdata;
+        fid = v9fs_fid_lookup(dentry);
+        if (!IS_ERR(fid)) {
+                spin_lock(&dent->lock);
+                list_del(&fid->dlist);
+                spin_unlock(&dent->lock);
         }
 
-        if(down_interruptible(&return_fid->lock))
-                return ERR_PTR(-EINTR);
-
-        return return_fid;
+        return fid;
 }
 
+
 /**
  * v9fs_fid_clone - lookup the fid for a dentry, clone a private copy and
- *                      release it
+ *      release it
  * @dentry: dentry to look for fid in
  *
  * find a fid in the dentry and then clone to a new private fid
@@ -146,49 +120,15 @@ struct v9fs_fid *v9fs_fid_lookup(struct dentry *dentry)
  *
  */
 
-struct v9fs_fid *v9fs_fid_clone(struct dentry *dentry)
+struct p9_fid *v9fs_fid_clone(struct dentry *dentry)
 {
-        struct v9fs_session_info *v9ses = v9fs_inode2v9ses(dentry->d_inode);
-        struct v9fs_fid *base_fid, *new_fid = ERR_PTR(-EBADF);
-        struct v9fs_fcall *fcall = NULL;
-        int fid, err;
-
-        base_fid = v9fs_fid_lookup(dentry);
-
-        if(IS_ERR(base_fid))
-                return base_fid;
-
-        if(base_fid) {  /* clone fid */
-                fid = v9fs_get_idpool(&v9ses->fidpool);
-                if (fid < 0) {
-                        eprintk(KERN_WARNING, "newfid fails!\n");
-                        new_fid = ERR_PTR(-ENOSPC);
-                        goto Release_Fid;
-                }
-
-                err = v9fs_t_walk(v9ses, base_fid->fid, fid, NULL, &fcall);
-                if (err < 0) {
-                        dprintk(DEBUG_ERROR, "clone walk didn't work\n");
-                        v9fs_put_idpool(fid, &v9ses->fidpool);
-                        new_fid = ERR_PTR(err);
-                        goto Free_Fcall;
-                }
-                new_fid = v9fs_fid_create(v9ses, fid);
-                if (new_fid == NULL) {
-                        dprintk(DEBUG_ERROR, "out of memory\n");
-                        new_fid = ERR_PTR(-ENOMEM);
-                }
-Free_Fcall:
-                kfree(fcall);
-        }
+        struct p9_fid *ofid, *fid;
 
-Release_Fid:
-        up(&base_fid->lock);
-        return new_fid;
-}
+        P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry);
+        ofid = v9fs_fid_lookup(dentry);
+        if (IS_ERR(ofid))
+                return ofid;
 
-void v9fs_fid_clunk(struct v9fs_session_info *v9ses, struct v9fs_fid *fid)
-{
-        v9fs_t_clunk(v9ses, fid->fid);
-        v9fs_fid_destroy(fid);
+        fid = p9_client_walk(ofid, 0, NULL, 1);
+        return fid;
 }