kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/fs/jfs/jfs_mount.c
..
..
@@ -1,19 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  *   Copyright (C) International Business Machines Corp., 2000-2004
3
- *
4
- *   This program is free software;  you can redistribute it and/or modify
5
- *   it under the terms of the GNU General Public License as published by
6
- *   the Free Software Foundation; either version 2 of the License, or
7
- *   (at your option) any later version.
8
- *
9
- *   This program is distributed in the hope that it will be useful,
10
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
11
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
12
- *   the GNU General Public License for more details.
13
- *
14
- *   You should have received a copy of the GNU General Public License
15
- *   along with this program;  if not, write to the Free Software
16
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
4
  */
18
5
 
19
6
 /*
..
..
@@ -49,6 +36,7 @@
49
36
 
50
37
 #include <linux/fs.h>
51
38
 #include <linux/buffer_head.h>
39
+#include <linux/blkdev.h>
52
40
 #include <linux/log2.h>
53
41
 
54
42
 #include "jfs_incore.h"
..
..
@@ -392,8 +380,8 @@
392
380
 		sbi->logpxd = j_sb->s_logpxd;
393
381
 	else {
394
382
 		sbi->logdev = new_decode_dev(le32_to_cpu(j_sb->s_logdev));
395
-		memcpy(sbi->uuid, j_sb->s_uuid, sizeof(sbi->uuid));
396
-		memcpy(sbi->loguuid, j_sb->s_loguuid, sizeof(sbi->uuid));
383
+		uuid_copy(&sbi->uuid, &j_sb->s_uuid);
384
+		uuid_copy(&sbi->loguuid, &j_sb->s_loguuid);
397
385
 	}
398
386
 	sbi->fsckpxd = j_sb->s_fsckpxd;
399
387
 	sbi->ait2 = j_sb->s_ait2;