1)do precreate record in obdfilter

[fs/lustre-release.git] / lustre / mds / mds_fs.c

diff --git a/lustre/mds/mds_fs.c b/lustre/mds/mds_fs.c
index c907a91..7194c3b 100644 (file)
--- a/lustre/mds/mds_fs.c
+++ b/lustre/mds/mds_fs.c
@@ -364,6 +364,25 @@ err_msd:
         RETURN(rc);
 }
 
+static int  mds_fs_post_setup(struct obd_device *obd)
+{
+        struct mds_obd *mds = &obd->u.mds;
+        struct dentry *de = mds_fid2dentry(mds, &mds->mds_rootfid, NULL);
+        int    rc = 0;
+       
+        rc = fsfilt_post_setup(obd);
+        if (rc)
+                GOTO(out, rc);
+ 
+        fsfilt_set_kml_flags(obd, de->d_inode);
+        fsfilt_set_kml_flags(obd, mds->mds_pending_dir->d_inode);
+        
+        fsfilt_set_mds_flags(obd, mds->mds_sb);
+out:
+        l_dput(de);
+        return rc; 
+}
+
 int mds_fs_setup(struct obd_device *obd, struct vfsmount *mnt)
 {
         struct mds_obd *mds = &obd->u.mds;
@@ -424,7 +443,7 @@ int mds_fs_setup(struct obd_device *obd, struct vfsmount *mnt)
                 GOTO(err_fid, rc);
         }
         mds->mds_pending_dir = dentry;
-
+      
         dentry = simple_mkdir(current->fs->pwd, "LOGS", 0777, 1);
         if (IS_ERR(dentry)) {
                 rc = PTR_ERR(dentry);
@@ -441,6 +460,14 @@ int mds_fs_setup(struct obd_device *obd, struct vfsmount *mnt)
         }
         mds->mds_objects_dir = dentry;
 
+        dentry = simple_mkdir(current->fs->pwd, "FIDS", 0777, 1);
+        if (IS_ERR(dentry)) {
+                rc = PTR_ERR(dentry);
+                CERROR("cannot create FIDS directory: rc = %d\n", rc);
+                GOTO(err_fids, rc);
+        }
+        mds->mds_fids_dir = dentry;
+
         /* open and test the last rcvd file */
         file = filp_open(LAST_RCVD, O_RDWR | O_CREAT, 0644);
         if (IS_ERR(file)) {
@@ -475,8 +502,12 @@ int mds_fs_setup(struct obd_device *obd, struct vfsmount *mnt)
                 GOTO(err_lov_objid, rc = -ENOENT);
         }
 err_pop:
+        if (!rc) {
+                rc = mds_fs_post_setup(obd);
+                if (rc)
+                        CERROR("can not post setup fsfilt\n");        
+        }
         pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
-
         return rc;
 
 err_lov_objid:
@@ -487,6 +518,8 @@ err_client:
 err_last_rcvd:
         if (mds->mds_rcvd_filp && filp_close(mds->mds_rcvd_filp, 0))
                 CERROR("can't close %s after error\n", LAST_RCVD);
+err_fids:
+        dput(mds->mds_fids_dir);
 err_objects:
         dput(mds->mds_objects_dir);
 err_logs:
@@ -498,6 +531,12 @@ err_fid:
         goto err_pop;
 }
 
+static int  mds_fs_post_cleanup(struct obd_device *obd)
+{
+        int    rc = 0;
+        rc = fsfilt_post_cleanup(obd);
+        return rc; 
+}
 
 int mds_fs_cleanup(struct obd_device *obd, int flags)
 {
@@ -525,6 +564,10 @@ int mds_fs_cleanup(struct obd_device *obd, int flags)
                 if (rc)
                         CERROR("%s file won't close, rc=%d\n", LOV_OBJID, rc);
         }
+        if (mds->mds_fids_dir != NULL) {
+                l_dput(mds->mds_fids_dir);
+                mds->mds_fids_dir = NULL;
+        }
         if (mds->mds_objects_dir != NULL) {
                 l_dput(mds->mds_objects_dir);
                 mds->mds_objects_dir = NULL;
@@ -537,6 +580,8 @@ int mds_fs_cleanup(struct obd_device *obd, int flags)
                 l_dput(mds->mds_pending_dir);
                 mds->mds_pending_dir = NULL;
         }
+        rc = mds_fs_post_cleanup(obd);
+        
         pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
         shrink_dcache_parent(mds->mds_fid_de);
         dput(mds->mds_fid_de);
@@ -608,10 +653,12 @@ int mds_obd_create(struct obd_export *exp, struct obdo *oa,
                 CERROR("error renaming new object "LPU64":%u: rc %d\n",
                        oa->o_id, oa->o_generation, rc);
 
-        err = fsfilt_commit(exp->exp_obd, mds->mds_objects_dir->d_inode,
-                            handle, 0);
-        if (!err)
-                oa->o_valid |= OBD_MD_FLID | OBD_MD_FLGENER;
+        err = fsfilt_commit(exp->exp_obd, mds->mds_sb, 
+                            mds->mds_objects_dir->d_inode, handle, 0);
+        if (!err) {
+                oa->o_gr = FILTER_GROUP_FIRST_MDS + mds->mds_num;
+                oa->o_valid |= OBD_MD_FLID | OBD_MD_FLGENER | OBD_MD_FLGROUP;
+        }
         else if (!rc)
                 rc = err;
 out_dput:
@@ -667,7 +714,8 @@ int mds_obd_destroy(struct obd_export *exp, struct obdo *oa,
                 CERROR("error destroying object "LPU64":%u: rc %d\n",
                        oa->o_id, oa->o_generation, rc);
         
-        err = fsfilt_commit(obd, mds->mds_objects_dir->d_inode, handle, 0);
+        err = fsfilt_commit(obd, mds->mds_sb, mds->mds_objects_dir->d_inode, 
+                            handle, 0);
         if (err && !rc)
                 rc = err;
 out_dput: