21 lines
518 B
Diff
21 lines
518 B
Diff
diff --git a/fs/ntfs/namei.c b/fs/ntfs/namei.c
|
|
--- a/fs/ntfs/namei.c
|
|
+++ b/fs/ntfs/namei.c
|
|
@@ -61,12 +61,12 @@ static int ntfs_check_bad_windows_name(struct ntfs_volume *vol,
|
|
const __le16 *wc,
|
|
unsigned int wc_len)
|
|
{
|
|
- if (ntfs_check_bad_char(wc, wc_len))
|
|
- return -EINVAL;
|
|
-
|
|
if (!NVolCheckWindowsNames(vol))
|
|
return 0;
|
|
|
|
+ if (ntfs_check_bad_char(wc, wc_len))
|
|
+ return -EINVAL;
|
|
+
|
|
/* Check for trailing space or dot. */
|
|
if (wc_len > 0 &&
|
|
(wc[wc_len - 1] == cpu_to_le16(' ') ||
|
|
|