diff --git a/[refs] b/[refs]
index 0fb17f6fcc1a..7f88d497dc28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7d2dc2a204fa37bdf607d4d062dfd14e392aaf1
+refs/heads/master: 89f5e1f2f13b1079b8d7ff7d3ade345b7ad7c009
diff --git a/trunk/drivers/scsi/osd/osd_uld.c b/trunk/drivers/scsi/osd/osd_uld.c
index 0bdef3390902..1ea6447f9418 100644
--- a/trunk/drivers/scsi/osd/osd_uld.c
+++ b/trunk/drivers/scsi/osd/osd_uld.c
@@ -224,7 +224,15 @@ void osduld_put_device(struct osd_dev *od)
 
 		BUG_ON(od->scsi_device != oud->od.scsi_device);
 
+		/* If scsi has released the device (logout), and exofs has last
+		 * reference on oud it will be freed by above osd_uld_release
+		 * within fput below. But this will oops in cdev_release which
+		 * is called after the fops->release. __uld_get/put pair makes
+		 * sure we have a cdev for the duration of fput
+		 */
+		__uld_get(oud);
 		fput(od->file);
+		__uld_put(oud);
 		kfree(od);
 	}
 }