- revert hacks back

diff --git a/lustre/include/linux/lustre_net.h b/lustre/include/linux/lustre_net.h
index 5f65c9b..9b64f63 100644 (file)
--- a/lustre/include/linux/lustre_net.h
+++ b/lustre/include/linux/lustre_net.h
@@ -128,7 +128,7 @@
  */
 #define MDS_MAXREQSIZE  (5 * 1024)
 
-#define OST_MAX_THREADS 48UL
+#define OST_MAX_THREADS 36UL
 #define OST_NUM_THREADS max(min_t(unsigned long, num_physpages / 8192, \
                                   OST_MAX_THREADS), 2UL)
 #define OST_NBUFS       (64 * smp_num_cpus)

diff --git a/lustre/obdfilter/filter_io_26.c b/lustre/obdfilter/filter_io_26.c
index c09586e..ad109e4 100644 (file)
--- a/lustre/obdfilter/filter_io_26.c
+++ b/lustre/obdfilter/filter_io_26.c
@@ -534,11 +534,9 @@ int filter_commitrw_write(struct obd_export *exp, struct obdo *oa,
 
         fsfilt_check_slow(now, obd_timeout, "direct_io");
 
-#if 0   /* disabled to evaluate impact -bzzz */
         err = fsfilt_commit_wait(obd, inode, wait_handle);
         if (rc == 0)
                 rc = err;
-#endif
 
         fsfilt_check_slow(now, obd_timeout, "commitrw commit");