Merge remote branch 'origin/xseg' into demo

Conflicts:
	xseg/tools/vlmc-blockd.py [trivial]

diff --cc xseg/peers/user/blockd.c
Simple merge

diff --cc xseg/peers/user/filed.c
Simple merge

diff --cc xseg/tools/helpers.sh
index f14ff38,1a7b69a..9bcda3c
--- 1/xseg/tools/helpers.sh
--- 2/xseg/tools/helpers.sh
+++ b/xseg/tools/helpers.sh
@@@ -31,9 -26,8 +31,9 @@@ function parse_config 
        [ -n "${BLOCKD_LOGS}" ] || BLOCKD_LOGS="/root/logs/"
        [ -n "${DEVICE_PREFIX}" ] || DEVICE_PREFIX="/dev/xsegbd"
        [ -n "${XSEGBD_SYSFS}" ] || XSEGBD_SYSFS="/sys/bus/xsegbd"
-       [ -n "${CHRDEV_NAME}" ] || CHRDEV_NAME="/dev/xsegdev"
+       [ -n "${CHRDEV_NAME}" ] || CHRDEV_NAME="/dev/segdev"
        [ -n "${CHRDEV_MAJOR}" ] || CHRDEV_MAJOR=60
 +      [ -n "${NR_OPS}" ] || NR_OPS=16
  }
  
  function unload_module {