super.c (01b954a36a03d90a66c9dd1fc13e4cb51269caf7) super.c (cbf5676a0e0463f05e5073589f3194846dfb02e7)
1/*
2 * super.c
3 *
4 * PURPOSE
5 * Super block routines for the OSTA-UDF(tm) filesystem.
6 *
7 * DESCRIPTION
8 * OSTA-UDF(tm) = Optical Storage Technology Association

--- 924 unchanged lines hidden (view full) ---

933 return 0;
934 }
935 return 1;
936}
937
938static void udf_load_pvoldesc(struct super_block *sb, struct buffer_head *bh)
939{
940 struct primaryVolDesc *pvoldesc;
1/*
2 * super.c
3 *
4 * PURPOSE
5 * Super block routines for the OSTA-UDF(tm) filesystem.
6 *
7 * DESCRIPTION
8 * OSTA-UDF(tm) = Optical Storage Technology Association

--- 924 unchanged lines hidden (view full) ---

933 return 0;
934 }
935 return 1;
936}
937
938static void udf_load_pvoldesc(struct super_block *sb, struct buffer_head *bh)
939{
940 struct primaryVolDesc *pvoldesc;
941 time_t recording;
942 long recording_usec;
943 struct ustr instr;
944 struct ustr outstr;
945
946 pvoldesc = (struct primaryVolDesc *)bh->b_data;
947
941 struct ustr instr;
942 struct ustr outstr;
943
944 pvoldesc = (struct primaryVolDesc *)bh->b_data;
945
948 if (udf_stamp_to_time(&recording, &recording_usec,
946 if (udf_stamp_to_time(&UDF_SB(sb)->s_record_time,
949 lets_to_cpu(pvoldesc->recordingDateAndTime))) {
950 kernel_timestamp ts;
951 ts = lets_to_cpu(pvoldesc->recordingDateAndTime);
947 lets_to_cpu(pvoldesc->recordingDateAndTime))) {
948 kernel_timestamp ts;
949 ts = lets_to_cpu(pvoldesc->recordingDateAndTime);
952 udf_debug("recording time %ld/%ld, %04u/%02u/%02u"
950 udf_debug("recording time %04u/%02u/%02u"
953 " %02u:%02u (%x)\n",
951 " %02u:%02u (%x)\n",
954 recording, recording_usec,
955 ts.year, ts.month, ts.day, ts.hour,
956 ts.minute, ts.typeAndTimezone);
952 ts.year, ts.month, ts.day, ts.hour,
953 ts.minute, ts.typeAndTimezone);
957 UDF_SB(sb)->s_record_time.tv_sec = recording;
958 UDF_SB(sb)->s_record_time.tv_nsec = recording_usec * 1000;
959 }
960
961 if (!udf_build_ustr(&instr, pvoldesc->volIdent, 32))
962 if (udf_CS0toUTF8(&outstr, &instr)) {
963 strncpy(UDF_SB(sb)->s_volume_ident, outstr.u_name,
964 outstr.u_len > 31 ? 31 : outstr.u_len);
965 udf_debug("volIdent[] = '%s'\n",
966 UDF_SB(sb)->s_volume_ident);

--- 1123 unchanged lines hidden --- 		954 }
955
956 if (!udf_build_ustr(&instr, pvoldesc->volIdent, 32))
957 if (udf_CS0toUTF8(&outstr, &instr)) {
958 strncpy(UDF_SB(sb)->s_volume_ident, outstr.u_name,
959 outstr.u_len > 31 ? 31 : outstr.u_len);
960 udf_debug("volIdent[] = '%s'\n",
961 UDF_SB(sb)->s_volume_ident);

--- 1123 unchanged lines hidden ---