Merge remote branch 'gh/wip-filestore-misc'

Conflicts:
	src/test/filestore/run_seed_to.sh

diff --cc src/Makefile.am
Simple merge

diff --cc src/test/filestore/run_seed_to.sh
index 3937e6b7f53f43d8decd60af209ff6f8df017ccf,f79874e156e2e9af42f7dc2889636b95b86cb822..25516eaad81c6858a2eb8c5beae3670ed8db04ee
--- 1/src/test/filestore/run_seed_to.sh
--- 2/src/test/filestore/run_seed_to.sh
+++ b/src/test/filestore/run_seed_to.sh
@@@ -70,7 -71,7 +71,11 @@@ journal_test=
  min_sync_interval="36000" # ten hours, yes.
  max_sync_interval="36001"
  exit_on_error=0
++<<<<<<< HEAD
 +
++=======
+ v=""
++>>>>>>> gh/wip-filestore-misc
  
  do_rm() {
    if [[ $on_btrfs -eq 0 ]]; then
@@@ -121,6 -122,10 +126,13 @@@ d
        exit_on_error=1
        shift
        ;;
++<<<<<<< HEAD
++=======
+     -v | --valgrind)
+       v="valgrind --leak-check=full"
+       shift
+       ;;
++>>>>>>> gh/wip-filestore-misc
      --)
        shift
        break
@@@ -239,31 -244,31 +251,57 @@@ d
    fi
  
    do_rm $tmp_name_a $tmp_name_a.fail $tmp_name_a.recover
++<<<<<<< HEAD
 +  test_filestore_idempotent_sequence run-sequence-to $to \
++=======
+   $v test_filestore_idempotent_sequence run-sequence-to $to \
++>>>>>>> gh/wip-filestore-misc
      $tmp_name_a $tmp_name_a/journal \
      --filestore-xattr-use-omap --test-seed $seed --osd-journal-size 100 \
      --filestore-kill-at $killat $tmp_opts_a \
      --log-file $tmp_name_a.fail --debug-filestore 20 || true
++<<<<<<< HEAD
 +
 +  stop_at=`test_filestore_idempotent_sequence get-last-op \
 +    $tmp_name_a $tmp_name_a/journal \
 +    --filestore-xattr-use-omap --log-file $tmp_name_a.recover \
 +    --debug-filestore 20 --debug-journal 20`
 +
 +  if [[ "`expr $stop_at - $stop_at 2>/dev/null`" != "0" ]]; then
 +    echo "error: get-last-op returned '$stop_at'"
 +    exit 1
 +  fi
 +
 +  echo stopped at $stop_at
 +
 +  do_rm $tmp_name_b $tmp_name_b.clean
 +  test_filestore_idempotent_sequence run-sequence-to \
++=======
+ 
+   stop_at=`test_filestore_idempotent_sequence get-last-op \
+     $tmp_name_a $tmp_name_a/journal \
+     --filestore-xattr-use-omap --log-file $tmp_name_a.recover \
+     --debug-filestore 20 --debug-journal 20`
+ 
+   if [[ "`expr $stop_at - $stop_at 2>/dev/null`" != "0" ]]; then
+     echo "error: get-last-op returned '$stop_at'"
+     exit 1
+   fi
+ 
+   echo stopped at $stop_at
+ 
+   do_rm $tmp_name_b $tmp_name_b.clean
+   $v test_filestore_idempotent_sequence run-sequence-to \
++>>>>>>> gh/wip-filestore-misc
      $stop_at $tmp_name_b $tmp_name_b/journal \
      --filestore-xattr-use-omap --test-seed $seed --osd-journal-size 100 \
      --log-file $tmp_name_b.clean --debug-filestore 20 $tmp_opts_b
  
++<<<<<<< HEAD
 +  if test_filestore_idempotent_sequence diff \
++=======
+   if $v test_filestore_idempotent_sequence diff \
++>>>>>>> gh/wip-filestore-misc
      $tmp_name_a $tmp_name_a/journal $tmp_name_b $tmp_name_b/journal \
      --filestore-xattr-use-omap; then
        echo OK