d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix couple panics on forced unmount of backing file.

Browse Source 
MFC after:	1 week
Sponsored by:	iXsystems, Inc.
This commit is contained in:
mav 2015-07-02 12:53:22 +00:00
parent 7e19266964
commit 88710d2d36
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/cam/ctl/ctl_backend_block.c
View File

@ -810,24 +810,27 @@ ctl_be_block_getattr_file(struct ctl_be_block_lun *be_lun, const char *attrname)
{
struct vattr vattr;
struct statfs statfs;
uint64_t val;
int error;
val = UINT64_MAX;
if (be_lun->vn == NULL)
return (UINT64_MAX);
return (val);
vn_lock(be_lun->vn, LK_SHARED | LK_RETRY);
if (strcmp(attrname, "blocksused") == 0) {
error = VOP_GETATTR(be_lun->vn, &vattr, curthread->td_ucred);
if (error != 0)
return (UINT64_MAX);
return (vattr.va_bytes >> be_lun->blocksize_shift);
if (error == 0)
val = vattr.va_bytes >> be_lun->blocksize_shift;
}
if (strcmp(attrname, "blocksavail") == 0) {
if (strcmp(attrname, "blocksavail") == 0 &&
(be_lun->vn->v_iflag & VI_DOOMED) == 0) {
error = VFS_STATFS(be_lun->vn->v_mount, &statfs);
if (error != 0)
return (UINT64_MAX);
return ((statfs.f_bavail * statfs.f_bsize) >>
be_lun->blocksize_shift);
if (error == 0)
val = (statfs.f_bavail * statfs.f_bsize) >>
be_lun->blocksize_shift;
}
return (UINT64_MAX);
VOP_UNLOCK(be_lun->vn, 0);
return (val);
}
static void
@ -2666,10 +2669,12 @@ ctl_be_block_modify(struct ctl_be_block_softc *softc, struct ctl_lun_req *req)
oldsize = be_lun->size_bytes;
if (be_lun->vn == NULL)
error = ctl_be_block_open(softc, be_lun, req);
else if (vn_isdisk(be_lun->vn, &error))
error = ctl_be_block_modify_dev(be_lun, req);
else if (be_lun->vn->v_type == VREG)
error = ctl_be_block_modify_file(be_lun, req);
else
error = ctl_be_block_modify_dev(be_lun, req);
error = EINVAL;
if (error == 0 && be_lun->size_bytes != oldsize) {
be_lun->size_blocks = be_lun->size_bytes >>