b=7237

 - always close transaction before calling lov/osc

diff --git a/lustre/mds/mds_open.c b/lustre/mds/mds_open.c
index 1f0c4ee..c4fc1d0 100644 (file)
--- a/lustre/mds/mds_open.c
+++ b/lustre/mds/mds_open.c
@@ -1272,13 +1272,8 @@ got_child:
                         }
                 }
 
-                if (!(rec->ur_flags & O_EXCL)) { /* bug 3313 */
-                        rc = fsfilt_commit(obd, dchild->d_inode->i_sb,
-                                           dchild->d_inode, handle, 
-                                           req->rq_export->exp_sync);
-                        handle = NULL;
-                }
-
+                rc = fsfilt_commit(obd, dchild->d_inode->i_sb, dchild->d_inode, handle, 0);
+                handle = NULL;
                 acc_mode = 0;           /* Don't check for permissions */
         }
         mds_pack_inode2body(obd, body, dchild->d_inode, 1);

diff --git a/lustre/osc/osc_create.c b/lustre/osc/osc_create.c
index a112d1f..c8af289 100644 (file)
--- a/lustre/osc/osc_create.c
+++ b/lustre/osc/osc_create.c
@@ -83,13 +83,9 @@ int osc_create(struct obd_export *exp, struct obdo *oa,
         LASSERT(acl == NULL && acl_size == 0);
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-        if (current->journal_info != NULL) {
-                static int dump_counter = 0;
-                CDEBUG(D_ERROR, "calling osc_create() with an "
-                       "open transaction isn't a good idea\n");
-                if (dump_counter++ % 100 == 0)
-                        portals_debug_dumpstack(NULL);
-        }
+        if (current->journal_info != NULL)
+                CWARN("calling osc_create() with an "
+                      "open transaction isn't a good idea\n");
 #endif
 
         if (oa->o_gr == FILTER_GROUP_LLOG || oa->o_gr == FILTER_GROUP_ECHO)