]> xenbits.xensource.com Git - people/julieng/freebsd.git/commitdiff
Remove lock upgrade attempt from ctl_be_block_open_file().
authormav <mav@FreeBSD.org>
Sun, 11 Oct 2015 08:28:49 +0000 (08:28 +0000)
committermav <mav@FreeBSD.org>
Sun, 11 Oct 2015 08:28:49 +0000 (08:28 +0000)
I am not sure what for it was done.  Now open routine should automatically
fall back to read-only if open for writing is impossible.  In such case
attempt to upgrade to write sounds strange.

MFC after: 1 week

sys/cam/ctl/ctl_backend_block.c

index 2930fbd662851de83c0eaf8f108de43497f55383..254f52bbc3b080da6f86cdd0b19faf4a42ab2afa 100644 (file)
@@ -1840,21 +1840,6 @@ ctl_be_block_open_file(struct ctl_be_block_lun *be_lun, struct ctl_lun_req *req)
                return (error);
        }
 
-       /*
-        * Verify that we have the ability to upgrade to exclusive
-        * access on this file so we can trap errors at open instead
-        * of reporting them during first access.
-        */
-       if (VOP_ISLOCKED(be_lun->vn) != LK_EXCLUSIVE) {
-               vn_lock(be_lun->vn, LK_UPGRADE | LK_RETRY);
-               if (be_lun->vn->v_iflag & VI_DOOMED) {
-                       error = EBADF;
-                       snprintf(req->error_str, sizeof(req->error_str),
-                                "error locking file %s", be_lun->dev_path);
-                       return (error);
-               }
-       }
-
        file_data->cred = crhold(curthread->td_ucred);
        if (params->lun_size_bytes != 0)
                be_lun->size_bytes = params->lun_size_bytes;