mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/fs/udf/lowlevel.c
..
..
@@ -27,41 +27,38 @@
27
27
 
28
28
 unsigned int udf_get_last_session(struct super_block *sb)
29
29
 {
30
+	struct cdrom_device_info *cdi = disk_to_cdi(sb->s_bdev->bd_disk);
30
31
 	struct cdrom_multisession ms_info;
31
-	unsigned int vol_desc_start;
32
-	struct block_device *bdev = sb->s_bdev;
33
-	int i;
34
32
 
35
-	vol_desc_start = 0;
33
+	if (!cdi) {
34
+		udf_debug("CDROMMULTISESSION not supported.\n");
35
+		return 0;
36
+	}
37
+
36
38
 	ms_info.addr_format = CDROM_LBA;
37
-	i = ioctl_by_bdev(bdev, CDROMMULTISESSION, (unsigned long)&ms_info);
38
-
39
-	if (i == 0) {
39
+	if (cdrom_multisession(cdi, &ms_info) == 0) {
40
40
 		udf_debug("XA disk: %s, vol_desc_start=%d\n",
41
41
 			  ms_info.xa_flag ? "yes" : "no", ms_info.addr.lba);
42
42
 		if (ms_info.xa_flag) /* necessary for a valid ms_info.addr */
43
-			vol_desc_start = ms_info.addr.lba;
44
-	} else {
45
-		udf_debug("CDROMMULTISESSION not supported: rc=%d\n", i);
43
+			return ms_info.addr.lba;
46
44
 	}
47
-	return vol_desc_start;
45
+	return 0;
48
46
 }
49
47
 
50
48
 unsigned long udf_get_last_block(struct super_block *sb)
51
49
 {
52
50
 	struct block_device *bdev = sb->s_bdev;
51
+	struct cdrom_device_info *cdi = disk_to_cdi(bdev->bd_disk);
53
52
 	unsigned long lblock = 0;
54
53
 
55
54
 	/*
56
-	 * ioctl failed or returned obviously bogus value?
55
+	 * The cdrom layer call failed or returned obviously bogus value?
57
56
 	 * Try using the device size...
58
57
 	 */
59
-	if (ioctl_by_bdev(bdev, CDROM_LAST_WRITTEN, (unsigned long) &lblock) ||
60
-	    lblock == 0)
58
+	if (!cdi || cdrom_get_last_written(cdi, &lblock) || lblock == 0)
61
59
 		lblock = i_size_read(bdev->bd_inode) >> sb->s_blocksize_bits;
62
60
 
63
61
 	if (lblock)
64
62
 		return lblock - 1;
65
-	else
66
-		return 0;
63
+	return 0;
67
64
 }