Commit 696aaaed authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Kevin Wolf
Browse files

block/file-posix: do not fail on unlock bytes 



bdrv_replace_child() calls bdrv_check_perm() with error_abort on
loosening permissions. However file-locking operations may fail even
in this case, for example on NFS. And this leads to Qemu crash.

Let's avoid such errors. Note, that we ignore such things anyway on
permission update commit and abort.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 38e694fc

block/file-posix.c

+12 −0
Original line number Diff line number Diff line
@@ -815,6 +815,18 @@ static int raw_handle_perm_lock(BlockDriverState *bs, 


    switch (op) {

    case RAW_PL_PREPARE:

        if ((s->perm | new_perm) == s->perm &&

            (s->shared_perm & new_shared) == s->shared_perm)

        {

            /*

             * We are going to unlock bytes, it should not fail. If it fail due

             * to some fs-dependent permission-unrelated reasons (which occurs

             * sometimes on NFS and leads to abort in bdrv_replace_child) we

             * can't prevent such errors by any check here. And we ignore them

             * anyway in ABORT and COMMIT.

             */

            return 0;

        }

        ret = raw_apply_lock_bytes(s, s->fd, s->perm | new_perm,

                                   ~s->shared_perm | ~new_shared,

                                   false, errp);