add ax88772_rst

hc

2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29

 kernel/fs/ntfs/runlist.c
..
..
@@ -1,23 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /**
2
3
  * runlist.c - NTFS runlist handling code.  Part of the Linux-NTFS project.
3
4
  *
4
5
  * Copyright (c) 2001-2007 Anton Altaparmakov
5
6
  * Copyright (c) 2002-2005 Richard Russon
6
- *
7
- * This program/include file is free software; you can redistribute it and/or
8
- * modify it under the terms of the GNU General Public License as published
9
- * by the Free Software Foundation; either version 2 of the License, or
10
- * (at your option) any later version.
11
- *
12
- * This program/include file is distributed in the hope that it will be
13
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
14
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
- * GNU General Public License for more details.
16
- *
17
- * You should have received a copy of the GNU General Public License
18
- * along with this program (in the main directory of the Linux-NTFS
19
- * distribution in the file COPYING); if not, write to the Free Software
20
- * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
21
7
  */
22
8
 
23
9
 #include "debug.h"
..
..
@@ -965,7 +951,7 @@
965
951
 	}
966
952
 	/* Now combine the new and old runlists checking for overlaps. */
967
953
 	old_rl = ntfs_runlists_merge(old_rl, rl);
968
-	if (likely(!IS_ERR(old_rl)))
954
+	if (!IS_ERR(old_rl))
969
955
 		return old_rl;
970
956
 	ntfs_free(rl);
971
957
 	ntfs_error(vol->sb, "Failed to merge runlists.");