Commit 83afa5cb authored by Anton Altaparmakov's avatar Anton Altaparmakov

NTFS: Cleanup whitespace (trailing space removal, etc).

parent 75bfb496
...@@ -19,6 +19,10 @@ ToDo: ...@@ -19,6 +19,10 @@ ToDo:
sufficient for synchronisation here. We then just need to make sure sufficient for synchronisation here. We then just need to make sure
ntfs_readpage/writepage/truncate interoperate properly with us. ntfs_readpage/writepage/truncate interoperate properly with us.
2.1.10 - .
- Finish off the white space cleanups (remove trailing spaces, etc).
2.1.9 - Fix two bugs in decompression engine. 2.1.9 - Fix two bugs in decompression engine.
- Fix a bug where we would not always detect that we have reached the - Fix a bug where we would not always detect that we have reached the
...@@ -880,4 +884,3 @@ tng-0.0.0 - Initial version tag. ...@@ -880,4 +884,3 @@ tng-0.0.0 - Initial version tag.
working nicely, too. Proof of inode metadata in the page cache and non- working nicely, too. Proof of inode metadata in the page cache and non-
resident file unnamed stream data in the page cache concepts is thus resident file unnamed stream data in the page cache concepts is thus
complete. complete.
...@@ -5,7 +5,7 @@ obj-$(CONFIG_NTFS_FS) += ntfs.o ...@@ -5,7 +5,7 @@ obj-$(CONFIG_NTFS_FS) += ntfs.o
ntfs-objs := aops.o attrib.o compress.o debug.o dir.o file.o inode.o logfile.o \ ntfs-objs := aops.o attrib.o compress.o debug.o dir.o file.o inode.o logfile.o \
mft.o mst.o namei.o super.o sysctl.o unistr.o upcase.o mft.o mst.o namei.o super.o sysctl.o unistr.o upcase.o
EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.9\" EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.10-WIP\"
ifeq ($(CONFIG_NTFS_DEBUG),y) ifeq ($(CONFIG_NTFS_DEBUG),y)
EXTRA_CFLAGS += -DDEBUG EXTRA_CFLAGS += -DDEBUG
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* attrib.h - Defines for attribute handling in NTFS Linux kernel driver. * attrib.h - Defines for attribute handling in NTFS Linux kernel driver.
* Part of the Linux-NTFS project. * Part of the Linux-NTFS project.
* *
* Copyright (c) 2001-2003 Anton Altaparmakov * Copyright (c) 2001-2004 Anton Altaparmakov
* Copyright (c) 2002 Richard Russon * Copyright (c) 2002 Richard Russon
* *
* This program/include file is free software; you can redistribute it and/or * This program/include file is free software; you can redistribute it and/or
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
* by the Free Software Foundation; either version 2 of the License, or * by the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program/include file is distributed in the hope that it will be * This program/include file is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS * along with this program (in the main directory of the Linux-NTFS
* distribution in the file COPYING); if not, write to the Free Software * distribution in the file COPYING); if not, write to the Free Software
* Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
...@@ -103,4 +103,3 @@ extern attr_search_context *get_attr_search_ctx(ntfs_inode *ni, ...@@ -103,4 +103,3 @@ extern attr_search_context *get_attr_search_ctx(ntfs_inode *ni,
extern void put_attr_search_ctx(attr_search_context *ctx); extern void put_attr_search_ctx(attr_search_context *ctx);
#endif /* _LINUX_NTFS_ATTRIB_H */ #endif /* _LINUX_NTFS_ATTRIB_H */
/* /*
* debug.c - NTFS kernel debug support. Part of the Linux-NTFS project. * debug.c - NTFS kernel debug support. Part of the Linux-NTFS project.
* *
* Copyright (c) 2001,2002 Anton Altaparmakov. * Copyright (c) 2001-2004 Anton Altaparmakov
* *
* This program/include file is free software; you can redistribute it and/or * This program/include file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published * modify it under the terms of the GNU General Public License as published
* by the Free Software Foundation; either version 2 of the License, or * by the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program/include file is distributed in the hope that it will be * This program/include file is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS * along with this program (in the main directory of the Linux-NTFS
* distribution in the file COPYING); if not, write to the Free Software * distribution in the file COPYING); if not, write to the Free Software
* Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
...@@ -172,4 +172,3 @@ void ntfs_debug_dump_runlist(const run_list_element *rl) ...@@ -172,4 +172,3 @@ void ntfs_debug_dump_runlist(const run_list_element *rl)
} }
#endif #endif
/* /*
* debug.h - NTFS kernel debug support. Part of the Linux-NTFS project. * debug.h - NTFS kernel debug support. Part of the Linux-NTFS project.
* *
* Copyright (c) 2001,2002 Anton Altaparmakov. * Copyright (c) 2001-2004 Anton Altaparmakov
* *
* This program/include file is free software; you can redistribute it and/or * This program/include file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published * modify it under the terms of the GNU General Public License as published
* by the Free Software Foundation; either version 2 of the License, or * by the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program/include file is distributed in the hope that it will be * This program/include file is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS * along with this program (in the main directory of the Linux-NTFS
* distribution in the file COPYING); if not, write to the Free Software * distribution in the file COPYING); if not, write to the Free Software
* Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
...@@ -69,4 +69,3 @@ extern void __ntfs_error(const char *function, const struct super_block *sb, ...@@ -69,4 +69,3 @@ extern void __ntfs_error(const char *function, const struct super_block *sb,
#define ntfs_error(sb, f, a...) __ntfs_error(__FUNCTION__, sb, f, ##a) #define ntfs_error(sb, f, a...) __ntfs_error(__FUNCTION__, sb, f, ##a)
#endif /* _LINUX_NTFS_DEBUG_H */ #endif /* _LINUX_NTFS_DEBUG_H */
...@@ -2,20 +2,20 @@ ...@@ -2,20 +2,20 @@
* dir.h - Defines for directory handling in NTFS Linux kernel driver. Part of * dir.h - Defines for directory handling in NTFS Linux kernel driver. Part of
* the Linux-NTFS project. * the Linux-NTFS project.
* *
* Copyright (c) 2002 Anton Altaparmakov. * Copyright (c) 2002-2004 Anton Altaparmakov
* *
* This program/include file is free software; you can redistribute it and/or * This program/include file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published * modify it under the terms of the GNU General Public License as published
* by the Free Software Foundation; either version 2 of the License, or * by the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program/include file is distributed in the hope that it will be * This program/include file is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS * along with this program (in the main directory of the Linux-NTFS
* distribution in the file COPYING); if not, write to the Free Software * distribution in the file COPYING); if not, write to the Free Software
* Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
...@@ -44,4 +44,3 @@ extern MFT_REF ntfs_lookup_inode_by_name(ntfs_inode *dir_ni, ...@@ -44,4 +44,3 @@ extern MFT_REF ntfs_lookup_inode_by_name(ntfs_inode *dir_ni,
const uchar_t *uname, const int uname_len, ntfs_name **res); const uchar_t *uname, const int uname_len, ntfs_name **res);
#endif /* _LINUX_NTFS_FS_DIR_H */ #endif /* _LINUX_NTFS_FS_DIR_H */
...@@ -2,20 +2,20 @@ ...@@ -2,20 +2,20 @@
* endian.h - Defines for endianness handling in NTFS Linux kernel driver. * endian.h - Defines for endianness handling in NTFS Linux kernel driver.
* Part of the Linux-NTFS project. * Part of the Linux-NTFS project.
* *
* Copyright (c) 2001 Anton Altaparmakov. * Copyright (c) 2001-2004 Anton Altaparmakov
* *
* This program/include file is free software; you can redistribute it and/or * This program/include file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published * modify it under the terms of the GNU General Public License as published
* by the Free Software Foundation; either version 2 of the License, or * by the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program/include file is distributed in the hope that it will be * This program/include file is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS * along with this program (in the main directory of the Linux-NTFS
* distribution in the file COPYING); if not, write to the Free Software * distribution in the file COPYING); if not, write to the Free Software
* Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
...@@ -45,4 +45,3 @@ ...@@ -45,4 +45,3 @@
#define cpu_to_sle64p(x) ((s64)__cpu_to_le64(*(s64*)(x))) #define cpu_to_sle64p(x) ((s64)__cpu_to_le64(*(s64*)(x)))
#endif /* _LINUX_NTFS_ENDIAN_H */ #endif /* _LINUX_NTFS_ENDIAN_H */
/* /*
* file.c - NTFS kernel file operations. Part of the Linux-NTFS project. * file.c - NTFS kernel file operations. Part of the Linux-NTFS project.
* *
* Copyright (c) 2001 Anton Altaparmakov. * Copyright (c) 2001-2004 Anton Altaparmakov
* *
* This program/include file is free software; you can redistribute it and/or * This program/include file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published * modify it under the terms of the GNU General Public License as published
* by the Free Software Foundation; either version 2 of the License, or * by the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program/include file is distributed in the hope that it will be * This program/include file is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS * along with this program (in the main directory of the Linux-NTFS
* distribution in the file COPYING); if not, write to the Free Software * distribution in the file COPYING); if not, write to the Free Software
* Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
...@@ -73,4 +73,3 @@ struct inode_operations ntfs_file_inode_ops = { ...@@ -73,4 +73,3 @@ struct inode_operations ntfs_file_inode_ops = {
struct file_operations ntfs_empty_file_ops = {}; struct file_operations ntfs_empty_file_ops = {};
struct inode_operations ntfs_empty_inode_ops = {}; struct inode_operations ntfs_empty_inode_ops = {};
...@@ -2280,4 +2280,3 @@ typedef struct { ...@@ -2280,4 +2280,3 @@ typedef struct {
} __attribute__ ((__packed__)) LOGGED_UTILITY_STREAM, EFS_ATTR; } __attribute__ ((__packed__)) LOGGED_UTILITY_STREAM, EFS_ATTR;
#endif /* _LINUX_NTFS_LAYOUT_H */ #endif /* _LINUX_NTFS_LAYOUT_H */
/* /*
* logfile.c - NTFS kernel journal handling. Part of the Linux-NTFS project. * logfile.c - NTFS kernel journal handling. Part of the Linux-NTFS project.
* *
* Copyright (c) 2002-2004 Anton Altaparmakov. * Copyright (c) 2002-2004 Anton Altaparmakov
* *
* This program/include file is free software; you can redistribute it and/or * This program/include file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published * modify it under the terms of the GNU General Public License as published
......
/* /*
* malloc.h - NTFS kernel memory handling. Part of the Linux-NTFS project. * malloc.h - NTFS kernel memory handling. Part of the Linux-NTFS project.
* *
* Copyright (c) 2001-2004 Anton Altaparmakov. * Copyright (c) 2001-2004 Anton Altaparmakov
* *
* This program/include file is free software; you can redistribute it and/or * This program/include file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published * modify it under the terms of the GNU General Public License as published
......
/** /**
* mft.c - NTFS kernel mft record operations. Part of the Linux-NTFS project. * mft.c - NTFS kernel mft record operations. Part of the Linux-NTFS project.
* *
* Copyright (c) 2001-2003 Anton Altaparmakov * Copyright (c) 2001-2004 Anton Altaparmakov
* Copyright (c) 2002 Richard Russon * Copyright (c) 2002 Richard Russon
* *
* This program/include file is free software; you can redistribute it and/or * This program/include file is free software; you can redistribute it and/or
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
* by the Free Software Foundation; either version 2 of the License, or * by the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program/include file is distributed in the hope that it will be * This program/include file is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS * along with this program (in the main directory of the Linux-NTFS
* distribution in the file COPYING); if not, write to the Free Software * distribution in the file COPYING); if not, write to the Free Software
* Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
...@@ -429,4 +429,3 @@ MFT_RECORD *map_extent_mft_record(ntfs_inode *base_ni, MFT_REF mref, ...@@ -429,4 +429,3 @@ MFT_RECORD *map_extent_mft_record(ntfs_inode *base_ni, MFT_REF mref,
ntfs_clear_extent_inode(ni); ntfs_clear_extent_inode(ni);
return m; return m;
} }
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* mft.h - Defines for mft record handling in NTFS Linux kernel driver. * mft.h - Defines for mft record handling in NTFS Linux kernel driver.
* Part of the Linux-NTFS project. * Part of the Linux-NTFS project.
* *
* Copyright (c) 2001-2004 Anton Altaparmakov. * Copyright (c) 2001-2004 Anton Altaparmakov
* *
* This program/include file is free software; you can redistribute it and/or * This program/include file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published * modify it under the terms of the GNU General Public License as published
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* mst.c - NTFS multi sector transfer protection handling code. Part of the * mst.c - NTFS multi sector transfer protection handling code. Part of the
* Linux-NTFS project. * Linux-NTFS project.
* *
* Copyright (c) 2001-2004 Anton Altaparmakov. * Copyright (c) 2001-2004 Anton Altaparmakov
* *
* This program/include file is free software; you can redistribute it and/or * This program/include file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published * modify it under the terms of the GNU General Public License as published
......
/* /*
* namei.c - NTFS kernel directory inode operations. Part of the Linux-NTFS * namei.c - NTFS kernel directory inode operations. Part of the Linux-NTFS
* project. * project.
* *
* Copyright (c) 2001-2004 Anton Altaparmakov * Copyright (c) 2001-2004 Anton Altaparmakov
* *
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
* by the Free Software Foundation; either version 2 of the License, or * by the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program/include file is distributed in the hope that it will be * This program/include file is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS * along with this program (in the main directory of the Linux-NTFS
* distribution in the file COPYING); if not, write to the Free Software * distribution in the file COPYING); if not, write to the Free Software
* Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* ntfs.h - Defines for NTFS Linux kernel driver. Part of the Linux-NTFS * ntfs.h - Defines for NTFS Linux kernel driver. Part of the Linux-NTFS
* project. * project.
* *
* Copyright (c) 2001-2004 Anton Altaparmakov. * Copyright (c) 2001-2004 Anton Altaparmakov
* Copyright (C) 2002 Richard Russon. * Copyright (C) 2002 Richard Russon
* *
* This program/include file is free software; you can redistribute it and/or * This program/include file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published * modify it under the terms of the GNU General Public License as published
...@@ -212,4 +212,3 @@ extern int ntfs_ucstonls(const ntfs_volume *vol, const uchar_t *ins, ...@@ -212,4 +212,3 @@ extern int ntfs_ucstonls(const ntfs_volume *vol, const uchar_t *ins,
extern uchar_t *generate_default_upcase(void); extern uchar_t *generate_default_upcase(void);
#endif /* _LINUX_NTFS_H */ #endif /* _LINUX_NTFS_H */
/* /*
* sysctl.c - Code for sysctl handling in NTFS Linux kernel driver. Part of * sysctl.c - Code for sysctl handling in NTFS Linux kernel driver. Part of
* the Linux-NTFS project. Adapted from the old NTFS driver, * the Linux-NTFS project. Adapted from the old NTFS driver,
* Copyright (C) 1997 Martin von Lwis, Rgis Duchesne. * Copyright (C) 1997 Martin von Lwis, Rgis Duchesne
* *
* Copyright (c) 2002 Anton Altaparmakov. * Copyright (c) 2002-2004 Anton Altaparmakov
* *
* This program/include file is free software; you can redistribute it and/or * This program/include file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published * modify it under the terms of the GNU General Public License as published
* by the Free Software Foundation; either version 2 of the License, or * by the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program/include file is distributed in the hope that it will be * This program/include file is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS * along with this program (in the main directory of the Linux-NTFS
* distribution in the file COPYING); if not, write to the Free Software * distribution in the file COPYING); if not, write to the Free Software
* Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
/* Definition of the ntfs sysctl. */ /* Definition of the ntfs sysctl. */
static ctl_table ntfs_sysctls[] = { static ctl_table ntfs_sysctls[] = {
{ FS_NTFS, "ntfs-debug", /* Binary and text IDs. */ { FS_NTFS, "ntfs-debug", /* Binary and text IDs. */
&debug_msgs,sizeof(debug_msgs), /* Data pointer and size. */ &debug_msgs,sizeof(debug_msgs), /* Data pointer and size. */
0644, NULL, &proc_dointvec }, /* Mode, child, proc handler. */ 0644, NULL, &proc_dointvec }, /* Mode, child, proc handler. */
{ 0 } { 0 }
...@@ -83,4 +83,3 @@ int ntfs_sysctl(int add) ...@@ -83,4 +83,3 @@ int ntfs_sysctl(int add)
#endif /* CONFIG_SYSCTL */ #endif /* CONFIG_SYSCTL */
#endif /* DEBUG */ #endif /* DEBUG */
/* /*
* sysctl.h - Defines for sysctl handling in NTFS Linux kernel driver. Part of * sysctl.h - Defines for sysctl handling in NTFS Linux kernel driver. Part of
* the Linux-NTFS project. Adapted from the old NTFS driver, * the Linux-NTFS project. Adapted from the old NTFS driver,
* Copyright (C) 1997 Martin von Löwis, Régis Duchesne. * Copyright (C) 1997 Martin von Löwis, Régis Duchesne
* *
* Copyright (c) 2002 Anton Altaparmakov. * Copyright (c) 2002-2004 Anton Altaparmakov
* *
* This program/include file is free software; you can redistribute it and/or * This program/include file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published * modify it under the terms of the GNU General Public License as published
* by the Free Software Foundation; either version 2 of the License, or * by the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program/include file is distributed in the hope that it will be * This program/include file is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS * along with this program (in the main directory of the Linux-NTFS
* distribution in the file COPYING); if not, write to the Free Software * distribution in the file COPYING); if not, write to the Free Software
* Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
...@@ -40,4 +40,3 @@ static inline int ntfs_sysctl(int add) ...@@ -40,4 +40,3 @@ static inline int ntfs_sysctl(int add)
#endif /* DEBUG && CONFIG_SYSCTL */ #endif /* DEBUG && CONFIG_SYSCTL */
#endif /* _LINUX_NTFS_SYSCTL_H */ #endif /* _LINUX_NTFS_SYSCTL_H */
/* /*
* time.h - NTFS time conversion functions. Part of the Linux-NTFS project. * time.h - NTFS time conversion functions. Part of the Linux-NTFS project.
* *
* Copyright (c) 2001-2004 Anton Altaparmakov. * Copyright (c) 2001-2004 Anton Altaparmakov
* *
* This program/include file is free software; you can redistribute it and/or * This program/include file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published * modify it under the terms of the GNU General Public License as published
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* types.h - Defines for NTFS Linux kernel driver specific types. * types.h - Defines for NTFS Linux kernel driver specific types.
* Part of the Linux-NTFS project. * Part of the Linux-NTFS project.
* *
* Copyright (c) 2001-2004 Anton Altaparmakov. * Copyright (c) 2001-2004 Anton Altaparmakov
* *
* This program/include file is free software; you can redistribute it and/or * This program/include file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published * modify it under the terms of the GNU General Public License as published
......
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
* by the Free Software Foundation; either version 2 of the License, or * by the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program/include file is distributed in the hope that it will be * This program/include file is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS * along with this program (in the main directory of the Linux-NTFS
* distribution in the file COPYING); if not, write to the Free Software * distribution in the file COPYING); if not, write to the Free Software
* Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
...@@ -62,9 +62,8 @@ static const u8 legal_ansi_char_array[0x40] = { ...@@ -62,9 +62,8 @@ static const u8 legal_ansi_char_array[0x40] = {
* the @upcase table is used to performa a case insensitive comparison. * the @upcase table is used to performa a case insensitive comparison.
*/ */
BOOL ntfs_are_names_equal(const uchar_t *s1, size_t s1_len, BOOL ntfs_are_names_equal(const uchar_t *s1, size_t s1_len,
const uchar_t *s2, size_t s2_len, const uchar_t *s2, size_t s2_len, const IGNORE_CASE_BOOL ic,
const IGNORE_CASE_BOOL ic, const uchar_t *upcase, const u32 upcase_size)
const uchar_t *upcase, const u32 upcase_size)
{ {
if (s1_len != s2_len) if (s1_len != s2_len)
return FALSE; return FALSE;
...@@ -78,12 +77,12 @@ BOOL ntfs_are_names_equal(const uchar_t *s1, size_t s1_len, ...@@ -78,12 +77,12 @@ BOOL ntfs_are_names_equal(const uchar_t *s1, size_t s1_len,
* @name1: first Unicode name to compare * @name1: first Unicode name to compare
* @name2: second Unicode name to compare * @name2: second Unicode name to compare
* @err_val: if @name1 contains an invalid character return this value * @err_val: if @name1 contains an invalid character return this value
* @ic: either CASE_SENSITIVE or IGNORE_CASE * @ic: either CASE_SENSITIVE or IGNORE_CASE
* @upcase: upcase table (ignored if @ic is CASE_SENSITIVE) * @upcase: upcase table (ignored if @ic is CASE_SENSITIVE)
* @upcase_len: upcase table size (ignored if @ic is CASE_SENSITIVE) * @upcase_len: upcase table size (ignored if @ic is CASE_SENSITIVE)
* *
* ntfs_collate_names collates two Unicode names and returns: * ntfs_collate_names collates two Unicode names and returns:
* *
* -1 if the first name collates before the second one, * -1 if the first name collates before the second one,
* 0 if the names match, * 0 if the names match,
* 1 if the second name collates before the first one, or * 1 if the second name collates before the first one, or
...@@ -138,7 +137,7 @@ int ntfs_collate_names(const uchar_t *name1, const u32 name1_len, ...@@ -138,7 +137,7 @@ int ntfs_collate_names(const uchar_t *name1, const u32 name1_len,
* Compare the first @n characters of the Unicode strings @s1 and @s2, * Compare the first @n characters of the Unicode strings @s1 and @s2,
* The strings in little endian format and appropriate le16_to_cpu() * The strings in little endian format and appropriate le16_to_cpu()
* conversion is performed on non-little endian machines. * conversion is performed on non-little endian machines.
* *
* The function returns an integer less than, equal to, or greater than zero * The function returns an integer less than, equal to, or greater than zero
* if @s1 (or the first @n Unicode characters thereof) is found, respectively, * if @s1 (or the first @n Unicode characters thereof) is found, respectively,
* to be less than, to match, or be greater than @s2. * to be less than, to match, or be greater than @s2.
...@@ -172,7 +171,7 @@ int ntfs_ucsncmp(const uchar_t *s1, const uchar_t *s2, size_t n) ...@@ -172,7 +171,7 @@ int ntfs_ucsncmp(const uchar_t *s1, const uchar_t *s2, size_t n)
* Compare the first @n characters of the Unicode strings @s1 and @s2, * Compare the first @n characters of the Unicode strings @s1 and @s2,
* ignoring case. The strings in little endian format and appropriate * ignoring case. The strings in little endian format and appropriate
* le16_to_cpu() conversion is performed on non-little endian machines. * le16_to_cpu() conversion is performed on non-little endian machines.
* *
* Each character is uppercased using the @upcase table before the comparison. * Each character is uppercased using the @upcase table before the comparison.
* *
* The function returns an integer less than, equal to, or greater than zero * The function returns an integer less than, equal to, or greater than zero
...@@ -180,7 +179,7 @@ int ntfs_ucsncmp(const uchar_t *s1, const uchar_t *s2, size_t n) ...@@ -180,7 +179,7 @@ int ntfs_ucsncmp(const uchar_t *s1, const uchar_t *s2, size_t n)
* to be less than, to match, or be greater than @s2. * to be less than, to match, or be greater than @s2.
*/ */
int ntfs_ucsncasecmp(const uchar_t *s1, const uchar_t *s2, size_t n, int ntfs_ucsncasecmp(const uchar_t *s1, const uchar_t *s2, size_t n,
const uchar_t *upcase, const u32 upcase_size) const uchar_t *upcase, const u32 upcase_size)
{ {
uchar_t c1, c2; uchar_t c1, c2;
size_t i; size_t i;
...@@ -381,4 +380,3 @@ retry: wc = nls->uni2char(le16_to_cpu(ins[i]), ns + o, ...@@ -381,4 +380,3 @@ retry: wc = nls->uni2char(le16_to_cpu(ins[i]), ns + o,
ntfs_error(vol->sb, "Failed to allocate name!"); ntfs_error(vol->sb, "Failed to allocate name!");
return -ENOMEM; return -ENOMEM;
} }
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* volume.h - Defines for volume structures in NTFS Linux kernel driver. Part * volume.h - Defines for volume structures in NTFS Linux kernel driver. Part
* of the Linux-NTFS project. * of the Linux-NTFS project.
* *
* Copyright (c) 2001-2004 Anton Altaparmakov. * Copyright (c) 2001-2004 Anton Altaparmakov
* Copyright (c) 2002 Richard Russon. * Copyright (c) 2002 Richard Russon
* *
* This program/include file is free software; you can redistribute it and/or * This program/include file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published * modify it under the terms of the GNU General Public License as published
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment