kernel: quick and dirty unlink

diff --git a/src/TODO b/src/TODO
index d89335a72a1523df317dabe928e3633a1ffa6323..60067edf7b5107153592c5bb8814d05e43003624 100644 (file)
--- a/src/TODO
+++ b/src/TODO
@@ -21,11 +21,10 @@ code cleanup
 kernel client
 - msg layer (patience)
 - mds client
-- mount
-  - get handle on root mount point
+  - examine new mds maps to kick requests for failed nodes...
 - osd client
 - mon client
-  - work out message resend logic..
+  - work out message resend logic..?
 
 
 osdmon

diff --git a/src/kernel/dir.c b/src/kernel/dir.c
index 549e345c40b33e0c61cde47d7719ef8f60bb2ce2..fa35469124a9efade045f275585cfce51462a884 100644 (file)
--- a/src/kernel/dir.c
+++ b/src/kernel/dir.c
@@ -257,19 +257,38 @@ static struct dentry *ceph_dir_lookup(struct inode *dir, struct dentry *dentry,
 }
 
 
-
-/*
-static int
-ceph_dir_create(struct inode *dir, struct dentry *dentry, int mode,
-               struct nameidata *nd)
+static int ceph_dir_unlink(struct inode *dir, struct dentry *dentry)
 {
-}
+       struct ceph_super_info *sbinfo = ceph_sbinfo(dir->i_sb);
+       struct ceph_mds_client *mdsc = &sbinfo->sb_client->mdsc;
+       struct inode *inode = dentry->d_inode;
+       struct ceph_msg *req;
+       struct ceph_mds_reply_info rinfo;
+       char path[200];
+       int pathlen;
+       int err;
 
+       dout(5, "dir_unlink dir %p dentry %p inode %p\n", dir, dentry, inode);
+       pathlen = get_dentry_path(dentry, path, dir->i_sb->s_root);
+       dout(5, "path is %s len %d\n", path, pathlen);
 
-static int ceph_dir_unlink(struct inode *i, struct dentry *d)
-{
+       req = ceph_mdsc_create_request(mdsc, CEPH_MDS_OP_UNLINK, 
+                                      dir->i_sb->s_root->d_inode->i_ino, path, 0, 0);
+       if (IS_ERR(req)) 
+               return PTR_ERR(req);
+       if ((err = ceph_mdsc_do_request(mdsc, req, &rinfo, -1)) < 0)
+               return err;
+       
+       err = le32_to_cpu(rinfo.head->result);
+       if (err == 0) {
+               inode_dec_link_count(inode);
+               /* FIXME update dir mtime etc. from reply trace */
+       }
+       return err;
 }
 
+
+/*
 static int ceph_dir_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 {
 }
@@ -279,6 +298,15 @@ static int ceph_dir_rmdir(struct inode *i, struct dentry *d)
 {
 }
 
+static int
+ceph_dir_create(struct inode *dir, struct dentry *dentry, int mode,
+               struct nameidata *nd)
+{
+}
+
+
+
+
 static int ceph_dir_rename(struct inode *old_dir, struct dentry *old_dentry,
                           struct inode *new_dir, struct dentry *new_dentry)
 {
@@ -288,10 +316,10 @@ static int ceph_dir_rename(struct inode *old_dir, struct dentry *old_dentry,
 const struct inode_operations ceph_dir_iops = {
        .lookup = ceph_dir_lookup,
 //     .getattr = ceph_inode_getattr,
-/*     .create = ceph_dir_create,
        .unlink = ceph_dir_unlink,
-       .mkdir = ceph_vfs_mkdir,
-       .rmdir = ceph_vfs_rmdir,
+//     .mkdir = ceph_vfs_mkdir,
+//     .rmdir = ceph_vfs_rmdir,
+/*     .create = ceph_dir_create,
        .mknod = ceph_vfs_mknod,
        .rename = ceph_vfs_rename,
        .getattr = ceph_vfs_getattr,