hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/fs/ntfs/runlist.c
....@@ -1,23 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /**
23 * runlist.c - NTFS runlist handling code. Part of the Linux-NTFS project.
34 *
45 * Copyright (c) 2001-2007 Anton Altaparmakov
56 * 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
217 */
228
239 #include "debug.h"
....@@ -965,7 +951,7 @@
965951 }
966952 /* Now combine the new and old runlists checking for overlaps. */
967953 old_rl = ntfs_runlists_merge(old_rl, rl);
968
- if (likely(!IS_ERR(old_rl)))
954
+ if (!IS_ERR(old_rl))
969955 return old_rl;
970956 ntfs_free(rl);
971957 ntfs_error(vol->sb, "Failed to merge runlists.");