Whamcloud - gitweb
LU-4863 lloop: avoid panic during blockdev_info 88/9888/2
authorBob Glossman <bob.glossman@intel.com>
Fri, 4 Apr 2014 21:21:28 +0000 (14:21 -0700)
committerOleg Drokin <oleg.drokin@intel.com>
Tue, 8 Apr 2014 13:49:41 +0000 (13:49 +0000)
Change the LL_IOC_LLOOP_INFO ioctl in the lustre lloop
device driver to return an error instead of causing
panics with LASSERT().

Signed-off-by: Bob Glossman <bob.glossman@intel.com>
Change-Id: Ib50afa94960dee6fb580038d6e96ea648252d9ea
Reviewed-on: http://review.whamcloud.com/9888
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
lustre/llite/lloop.c

index cef0de6..90bf646 100644 (file)
@@ -645,7 +645,10 @@ static int lo_ioctl(struct block_device *bdev, fmode_t mode,
         case LL_IOC_LLOOP_INFO: {
                 struct lu_fid fid;
 
         case LL_IOC_LLOOP_INFO: {
                 struct lu_fid fid;
 
-                LASSERT(lo->lo_backing_file != NULL);
+               if (lo->lo_backing_file == NULL) {
+                       err = -ENOENT;
+                       break;
+               }
                 if (inode == NULL)
                         inode = lo->lo_backing_file->f_dentry->d_inode;
                 if (lo->lo_state == LLOOP_BOUND)
                 if (inode == NULL)
                         inode = lo->lo_backing_file->f_dentry->d_inode;
                 if (lo->lo_state == LLOOP_BOUND)