Merge branch 'master' of ssh://git.kernel.dk/data/git/fio

diff --combined configure
index d41a1c3ae5b61570b2b614d5c1ea72e948265913,de0fc893eeefc16f664eb87d3b410c8ba9f24e67..eefe28e8428c66ac7b8cb77711b18c4e6c314269
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1202,6 -1202,26 +1202,26 @@@ if test "$disable_rbd" != "yes"  && com
  fi
  echo "Rados Block Device engine     $rbd"
  
+ ##########################################
+ # check for rbd_invaidate_cache()
+ rbd_inval="no"
+ if test "$rbd" = "yes"; then
+ cat > $TMPC << EOF
+ #include <rbd/librbd.h>
+ 
+ int main(int argc, char **argv)
+ {
+   rbd_image_t image;
+ 
+   return rbd_invalidate_cache(image);
+ }
+ EOF
+ if compile_prog "" "-lrbd -lrados" "rbd"; then
+   rbd_inval="yes"
+ fi
+ echo "rbd_invalidate_cache          $rbd_inval"
+ fi
+ 
  ##########################################
  # Check whether we have setvbuf
  setvbuf="no"
@@@ -1241,6 -1261,7 +1261,7 @@@ f
  
  ##########################################
  # check for gfapi fadvise support
+ if test "$gfapi" = "yes" ; then
  gf_fadvise="no"
  cat > $TMPC << EOF
  #include <glusterfs/api/glfs.h>
@@@ -1253,11 -1274,29 +1274,29 @@@ int main(int argc, char **argv
    return 0;
  }
  EOF
- 
  if compile_prog "" "-lgfapi -lglusterfs" "gfapi"; then
    gf_fadvise="yes"
  fi
  echo "Gluster API use fadvise       $gf_fadvise"
+ fi
+ 
+ ##########################################
+ # check for gfapi trim support
+ gf_trim="no"
+ if test "$gfapi" = "yes" ; then
+ cat > $TMPC << EOF
+ #include <glusterfs/api/glfs.h>
+ 
+ int main(int argc, char **argv)
+ {
+   return glfs_discard_async(NULL, 0, 0);
+ }
+ EOF
+ if compile_prog "" "-lgfapi -lglusterfs" "gf trim"; then
+   gf_trim="yes"
+ fi
+ echo "Gluster API trim support      $gf_trim"
+ fi
  
  ##########################################
  # Check if we support stckf on s390
@@@ -1317,7 -1356,6 +1356,7 @@@ yacc="no
  yacc_is_bison="no"
  lex="no"
  arith="no"
 +if test "$targetos" != "SunOS" ; then
  LEX=$(which lex 2> /dev/null)
  if test -x "$LEX" ; then
    lex="yes"
@@@ -1346,13 -1384,13 +1385,13 @@@ int main(int argc, char **argv
    return 0;
  }
  EOF
 -
  if compile_prog "" "-ll" "lex"; then
    LIBS="-ll $LIBS"
  else
    arith="no"
  fi
  fi
 +fi
  
  echo "lex/yacc for arithmetic       $arith"
  
@@@ -1490,6 -1528,9 +1529,9 @@@ f
  if test "$rbd" = "yes" ; then
    output_sym "CONFIG_RBD"
  fi
+ if test "$rbd_inval" = "yes" ; then
+   output_sym "CONFIG_RBD_INVAL"
+ fi
  if test "$setvbuf" = "yes" ; then
    output_sym "CONFIG_SETVBUF"
  fi
@@@ -1503,6 -1544,9 +1545,9 @@@ f
  if test "$gf_fadvise" = "yes" ; then
    output_sym "CONFIG_GF_FADVISE"
  fi
+ if test "$gf_trim" = "yes" ; then
+   output_sym "CONFIG_GF_TRIM"
+ fi
  if test "$libhdfs" = "yes" ; then
    output_sym "CONFIG_LIBHDFS"
  fi