Remove recreation code from filter_truncate() and filter_preprw_write().

b=13499
i=adilger
i=shadow

diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index 733b73e..fd63b93 100644 (file)
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -3375,10 +3375,7 @@ static int filter_truncate(struct obd_export *exp, struct obd_info *oinfo,
                            struct obd_trans_info *oti,
                            struct ptlrpc_request_set *rqset)
 {
-        struct obdo *oa = oinfo->oi_oa;
-        struct dentry *dentry;
-        struct lvfs_run_ctxt saved;
-        int rc = 0;
+        int rc;
         ENTRY;
 
         if (oinfo->oi_policy.l_extent.end != OBD_OBJECT_EOF) {
@@ -3388,45 +3385,12 @@ static int filter_truncate(struct obd_export *exp, struct obd_info *oinfo,
         }
 
         CDEBUG(D_INODE, "calling truncate for object "LPU64", valid = "LPX64
-               ", o_size = "LPD64"\n", oa->o_id,
-               oa->o_valid, oinfo->oi_policy.l_extent.start);
-
-        oa->o_size = oinfo->oi_policy.l_extent.start;
-
-        if (!(oa->o_valid & OBD_MD_FLGROUP))
-                oa->o_gr = 0;
-
-        push_ctxt(&saved, &exp->exp_obd->obd_lvfs_ctxt, NULL);
-        lock_kernel();
-
-        dentry = filter_fid2dentry(exp->exp_obd, NULL, oa->o_gr, oa->o_id);
-        if (IS_ERR(dentry))
-                GOTO(out_unlock, rc = PTR_ERR(dentry));
-
-        if (dentry->d_inode == NULL) {
-                if (oinfo->oi_policy.l_extent.start == 0 &&
-                    filter_recreate(exp->exp_obd, oa) == 0) {
-                        f_dput(dentry);
-                        dentry = filter_fid2dentry(exp->exp_obd, NULL,
-                                                   oa->o_gr, oa->o_id);
-                }
-                if (IS_ERR(dentry) || dentry->d_inode == NULL) {
-                        CERROR("%s: punch missing obj "LPU64"/"LPU64": rc %d\n",
-                               exp->exp_obd->obd_name, oa->o_id, oa->o_gr, rc);
-                        if (IS_ERR(dentry))
-                                GOTO(out_unlock, rc = -ENOENT);
-                        GOTO(out_dput, rc = -ENOENT);
-                }
-        }
+               ", o_size = "LPD64"\n", oinfo->oi_oa->o_id,
+               oinfo->oi_oa->o_valid, oinfo->oi_policy.l_extent.start);
 
+        oinfo->oi_oa->o_size = oinfo->oi_policy.l_extent.start;
         rc = filter_setattr(exp, oinfo, oti);
 
-out_dput:
-        f_dput(dentry);
-out_unlock:
-        unlock_kernel();
-        pop_ctxt(&saved, &exp->exp_obd->obd_lvfs_ctxt, NULL);
-
         RETURN(rc);
 }
 

diff --git a/lustre/obdfilter/filter_io.c b/lustre/obdfilter/filter_io.c
index a63983d..cd5f1d1 100644 (file)
--- a/lustre/obdfilter/filter_io.c
+++ b/lustre/obdfilter/filter_io.c
@@ -527,33 +527,9 @@ static int filter_preprw_write(int cmd, struct obd_export *exp, struct obdo *oa,
         cleanup_phase = 2;
 
         if (dentry->d_inode == NULL) {
-                struct obdo *noa = oa;
-
-                if (oa == NULL) {
-                        OBDO_ALLOC(noa);
-                        if (noa == NULL)
-                                GOTO(recreate_out, rc = -ENOENT);
-                        noa->o_id = obj->ioo_id;
-                        noa->o_valid = OBD_MD_FLID;
-                }
-
-                if (filter_recreate(exp->exp_obd, noa) == 0) {
-                        f_dput(dentry);
-                        dentry = filter_fid2dentry(exp->exp_obd, NULL,
-                                                   obj->ioo_gr, obj->ioo_id);
-                }
-                if (oa == NULL)
-                        OBDO_FREE(noa);
-        recreate_out:
-                if (IS_ERR(dentry) || dentry->d_inode == NULL) {
-                        CERROR("%s: BRW to missing obj "LPU64"/"LPU64":rc %d\n",
-                               exp->exp_obd->obd_name,
-                               obj->ioo_id, obj->ioo_gr,
-                               IS_ERR(dentry) ? (int)PTR_ERR(dentry) : -ENOENT);
-                        if (IS_ERR(dentry))
-                                cleanup_phase = 1;
-                        GOTO(cleanup, rc = -ENOENT);
-                }
+                CERROR("%s: trying to BRW to non-existent file "LPU64"\n",
+                       exp->exp_obd->obd_name, obj->ioo_id);
+                GOTO(cleanup, rc = -ENOENT);
         }
 
         fso.fso_dentry = dentry;