svn commit: r259332 - releng/10.0/sys/cam/ctl

[Edward Tomasz Napierala]

Author: trasz
Date: Fri Dec 13 21:22:12 2013
New Revision: 259332
URL: http://svnweb.freebsd.org/changeset/base/259332

Log:
  MFC r258871:
  
  Properly report an error instead of panicing when user tries to create
  LUN backed by non-disk device, e.g. /dev/null.
  
  Approved by:	re (glebius)
  Sponsored by:	The FreeBSD Foundation

Modified:
  releng/10.0/sys/cam/ctl/ctl_backend_block.c
Directory Properties:
  releng/10.0/   (props changed)

Modified: releng/10.0/sys/cam/ctl/ctl_backend_block.c
==============================================================================
--- releng/10.0/sys/cam/ctl/ctl_backend_block.c	Fri Dec 13 20:54:45 2013	(r259331)
+++ releng/10.0/sys/cam/ctl/ctl_backend_block.c	Fri Dec 13 21:22:12 2013	(r259332)
@@ -1485,6 +1485,7 @@ ctl_be_block_close(struct ctl_be_block_l
 		case CTL_BE_BLOCK_FILE:
 			break;
 		case CTL_BE_BLOCK_NONE:
+			break;
 		default:
 			panic("Unexpected backend type.");
 			break;
@@ -1503,6 +1504,7 @@ ctl_be_block_close(struct ctl_be_block_l
 			}
 			break;
 		case CTL_BE_BLOCK_NONE:
+			break;
 		default:
 			panic("Unexpected backend type.");
 			break;
@@ -1589,7 +1591,7 @@ ctl_be_block_open(struct ctl_be_block_so
 	} else {
 		error = EINVAL;
 		snprintf(req->error_str, sizeof(req->error_str),
-			 "%s is not a disk or file", be_lun->dev_path);
+			 "%s is not a disk or plain file", be_lun->dev_path);
 	}
 	VOP_UNLOCK(be_lun->vn, 0);