Minor cleanups.

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index 4ea1c21..b948665 100644 (file)
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -155,8 +155,10 @@ static struct dentry *ll_lookup2(struct inode *dir, struct dentry *dentry,
 
         ENTRY;
 
-        CHECK_MOUNT_EPOCH(dir);
-        
+        /* CHECK_MOUNT_EPOCH(dir); */
+        if (ll_i2info(dir)->lli_mount_epoch != ll_i2sbi(dir)->ll_mount_epoch)
+                RETURN(ERR_PTR(-EIO));
+
         if (it == NULL) {
                 it = &lookup_it;
                 dentry->d_it = it;

diff --git a/lustre/llite/super.c b/lustre/llite/super.c
index 7163e08..05c6876 100644 (file)
--- a/lustre/llite/super.c
+++ b/lustre/llite/super.c
@@ -260,7 +260,7 @@ static void ll_put_super(struct super_block *sb)
 
 static void ll_clear_inode(struct inode *inode)
 {
-        /* XXX EPOCH */
+        ENTRY;
 
         if (atomic_read(&inode->i_count) == 0) {
                 struct ll_inode_info *lli = ll_i2info(inode);
@@ -276,10 +276,12 @@ static void ll_clear_inode(struct inode *inode)
                         lli->lli_symlink_name = NULL;
                 }
         }
+        EXIT;
 }
 
 static void ll_delete_inode(struct inode *inode)
 {
+        ENTRY;
         if (S_ISREG(inode->i_mode)) {
                 int err;
                 struct obdo *oa;
@@ -310,6 +312,7 @@ static void ll_delete_inode(struct inode *inode)
         }
 out:
         clear_inode(inode);
+        EXIT;
 }
 
 /* like inode_setattr, but doesn't mark the inode dirty */

diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c
index 41fb273..7e2f0f1 100644 (file)
--- a/lustre/mds/mds_reint.c
+++ b/lustre/mds/mds_reint.c
@@ -419,7 +419,7 @@ static int mds_reint_unlink(struct mds_update_record *rec, int offset,
         struct dentry *dchild = NULL;
         struct mds_obd *mds = mds_req2mds(req);
         struct obd_device *obd = req->rq_export->exp_obd;
-        struct mds_body *body;
+        struct mds_body *body = NULL;
         char *name;
         struct inode *dir, *inode;
         struct lustre_handle lockh, child_lockh;