Am 02.05.2017 um 10:18 hat Fam Zheng geschrieben: > v16: Rebase to the latest block-next branch of Kevin. > Address Kevin's comments: > - on/off => on/off/auto for file.locking option > - Add file.locking to QAPI schema > - Fall back to POSIX file lock if OFD lock not available > - Print warning when falling back, if locking=on specified > (This means qemu-io/qemu-img need --image-opts to enable lock) > - Drop the BLK_PERM_MAX patch and use an alternative > - Use the 'TEST_IMG="$TEST_IMG.base" _make_test_img ...' idiom > - Drop reopen callback changes > - Don't open s->lock_fd if !s->use_lock > - Use the same open flags for the lock fd > - Don't leak the returned string for bdrv_perm_names > - Clear up comment on raw_apply_lock_bytes > - Improve error message text > - Pass "0, 0" to raw_handle_perm_lock in raw_abort_perm_update > - Filter out test dir in reference output > - Add locking to bdrv_host_device.
Looks like we're almost there! :-) The actual locking code looks good to me now. I had a try at cleaning up the BDRV_O_INACTIVE handling at the block layer level so that we don't need the special code in file-posix (and we definitely want to do this), but it's a bit harder than I thought. So let's merge your file-posix code as it is and clean up things on top. Kevin