diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index ee4ae5cfd646186430e9042283135c1862b8e5c3..5a20621721fc8ba08338ba681ded3087bdda7279 100644
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -30,6 +30,7 @@ ToDo/Notes:
 	  kernel.
 	- Get rid of the ugly transparent union in fs/ntfs/dir.c::ntfs_readdir()
 	  and ntfs_filldir() as per suggestion from Al Viro.
+	- Change '\0' and L'\0' to simply 0 as per advice from Linus Torvalds.
 
 2.1.18 - Fix scheduling latencies at mount time as well as an endianness bug.
 
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c
index 6027259288df00e3315b751b1bff980ba825f855..599aa0d83f4d5a0cdabb9ab0b5b6ee62e5c79612 100644
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -130,7 +130,7 @@ static int ntfs_init_locked_inode(struct inode *vi, ntfs_attr *na)
 		if (!ni->name)
 			return -ENOMEM;
 		memcpy(ni->name, na->name, i);
-		ni->name[i] = cpu_to_le16(L'\0');
+		ni->name[i] = cpu_to_le16(0);
 	}
 	return 0;
 }
@@ -2270,6 +2270,12 @@ int ntfs_show_options(struct seq_file *sf, struct vfsmount *mnt)
  *
  * We don't support i_size changes yet.
  *
+ * The kernel guarantees that @vi is a regular file (S_ISREG() is true) and
+ * that the change is allowed.
+ *
+ * This implies for us that @vi is a file inode rather than a directory, index,
+ * or attribute inode as well as that @vi is a base inode.
+ *
  * Called with ->i_sem held.  In all but one case ->i_alloc_sem is held for
  * writing.  The only case where ->i_alloc_sem is not held is
  * mm/filemap.c::generic_file_buffered_write() where vmtruncate() is called
@@ -2279,10 +2285,10 @@ int ntfs_show_options(struct seq_file *sf, struct vfsmount *mnt)
 void ntfs_truncate(struct inode *vi)
 {
 	// TODO: Implement...
-	ntfs_warning(vi->i_sb, "Eeek: i_size may have changed! If you see "
+	ntfs_warning(vi->i_sb, "Eeek: i_size may have changed!  If you see "
 			"this right after a message from "
-			"ntfs_{prepare,commit}_{,nonresident_}write() then "
-			"just ignore it. Otherwise it is bad news.");
+			"ntfs_prepare_{,nonresident_}write() then just ignore "
+			"it.  Otherwise it is bad news.");
 	// TODO: reset i_size now!
 	return;
 }
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index fcb7910a417b025dbeb8745719d6ae1787202d3a..cce6fa1f6a53a8adb65e39c83b327860222d8def 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -145,7 +145,7 @@ static BOOL parse_options(ntfs_volume *vol, char *opt)
 	ntfs_debug("Entering with mount options string: %s", opt);
 	while ((p = strsep(&opt, ","))) {
 		if ((v = strchr(p, '=')))
-			*v++ = '\0';
+			*v++ = 0;
 		NTFS_GETOPT("uid", uid)
 		else NTFS_GETOPT("gid", gid)
 		else NTFS_GETOPT("umask", fmask = dmask)
diff --git a/fs/ntfs/unistr.c b/fs/ntfs/unistr.c
index 507f836f9d70133a234a8dcd08926cf26807513f..1a541fd7785533e4922dea6d77469bc214978c93 100644
--- a/fs/ntfs/unistr.c
+++ b/fs/ntfs/unistr.c
@@ -276,7 +276,7 @@ int ntfs_nlstoucs(const ntfs_volume *vol, const char *ins,
 				} /* else (wc_len < 0) */
 				goto conversion_err;
 			}
-			ucs[o] = cpu_to_le16('\0');
+			ucs[o] = cpu_to_le16(0);
 			*outs = ucs;
 			return o;
 		} /* else (!ucs) */
@@ -362,7 +362,7 @@ retry:			wc = nls->uni2char(le16_to_cpu(ins[i]), ns + o,
 			} /* wc < 0, real error. */
 			goto conversion_err;
 		}
-		ns[o] = '\0';
+		ns[o] = 0;
 		*outs = ns;
 		return o;
 	} /* else (!ins) */