bk://linux-ntfs.bkbits.net/ntfs-2.6-devel ntfs@flatcap.org|ChangeSet|20040926033842|06866 ntfs # This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/09/26 10:57:39-07:00 akpm@bix.(none) # Merge bk://linux-ntfs.bkbits.net/ntfs-2.6-devel # into bix.(none):/usr/src/bk-ntfs # # fs/ntfs/super.c # 2004/09/26 10:57:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/inode.c # 2004/09/26 10:57:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/dir.c # 2004/09/26 10:57:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/09/26 01:04:26+01:00 aia21@cantab.net # NTFS: Change {const_,}cpu_to_le{16,32}(0) to just 0 as suggested by Al Viro. # # Signed-off-by: Anton Altaparmakov # # fs/ntfs/ChangeLog # 2004/09/26 01:02:50+01:00 aia21@cantab.net +1 -0 # Update # # fs/ntfs/super.c # 2004/09/26 00:56:51+01:00 aia21@cantab.net +2 -2 # Change const_cpu_to_le16(0) to just 0. # # fs/ntfs/unistr.c # 2004/09/26 00:56:40+01:00 aia21@cantab.net +1 -1 # Change cpu_to_le16(0) to just 0. # # fs/ntfs/mft.c # 2004/09/26 00:56:13+01:00 aia21@cantab.net +4 -4 # Change cpu_to_le{16,32}(0) to just 0. # # fs/ntfs/inode.c # 2004/09/26 00:55:59+01:00 aia21@cantab.net +1 -1 # Change cpu_to_le16(0) to just 0. # # fs/ntfs/dir.c # 2004/09/26 00:55:24+01:00 aia21@cantab.net +1 -2 # Change const_cpu_to_le16(0) to just 0. # # ChangeSet # 2004/09/26 00:45:09+01:00 aia21@cantab.net # NTFS: Convert final enum (fs/ntfs/logfile.h) to define to silence last # bitwise sparse warning. # # Signed-off-by: Anton Altaparmakov # # fs/ntfs/logfile.h # 2004/09/26 00:42:42+01:00 aia21@cantab.net +3 -4 # Convert final enum to define to silence last bitwise sparse # warning. # # ChangeSet # 2004/09/26 00:24:30+01:00 aia21@cantab.net # NTFS: Remove silly (__force le32) casts from __ntfs_is_magic{,p} # helper functions. Thanks to Al Viro for spotting them. # # Signed-off-by: Anton Altaparmakov # # fs/ntfs/layout.h # 2004/09/26 00:22:54+01:00 aia21@cantab.net +2 -2 # Remove silly (__force le32) casts from __ntfs_is_magic{,p} # helper functions. # # ChangeSet # 2004/09/24 13:57:03-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-ntfs # # fs/ntfs/super.c # 2004/09/24 13:56:59-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/inode.c # 2004/09/24 13:56:59-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/dir.c # 2004/09/24 13:56:59-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/compress.c # 2004/09/24 13:56:59-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/attrib.c # 2004/09/24 13:56:59-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/09/23 17:00:09-07:00 akpm@bix.(none) # Merge bk://linux-ntfs.bkbits.net/ntfs-2.6-devel # into bix.(none):/usr/src/bk-ntfs # # fs/ntfs/super.c # 2004/09/23 17:00:05-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/inode.c # 2004/09/23 17:00:05-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/09/22 23:41:10-07:00 akpm@bix.(none) # Merge bk://linux-ntfs.bkbits.net/ntfs-2.6-devel # into bix.(none):/usr/src/bk-ntfs # # fs/ntfs/dir.c # 2004/09/22 23:41:06-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/09/22 13:53:34-07:00 akpm@bix.(none) # Merge bk://linux-ntfs.bkbits.net/ntfs-2.6-devel # into bix.(none):/usr/src/bk-ntfs # # fs/ntfs/inode.c # 2004/09/22 13:53:28-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/dir.c # 2004/09/22 13:53:28-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/09/22 13:52:24-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-ntfs # # fs/ntfs/inode.c # 2004/09/22 13:52:20-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/09/21 21:05:32-07:00 akpm@bix.(none) # Merge bk://linux-ntfs.bkbits.net/ntfs-2.6-devel # into bix.(none):/usr/src/bk-ntfs # # fs/ntfs/super.c # 2004/09/21 21:05:28-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/inode.c # 2004/09/21 21:05:28-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/dir.c # 2004/09/21 21:05:28-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/attrib.c # 2004/09/21 21:05:27-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/aops.c # 2004/09/21 21:05:27-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/09/20 14:19:39-07:00 akpm@bix.(none) # Merge bk://linux-ntfs.bkbits.net/ntfs-2.6-devel # into bix.(none):/usr/src/bk-ntfs # # fs/ntfs/super.c # 2004/09/20 14:19:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/inode.c # 2004/09/20 14:19:35-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/09/17 13:12:24-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-ntfs # # fs/ntfs/super.c # 2004/09/17 13:12:20-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/inode.c # 2004/09/17 13:12:20-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/09/14 14:26:30-07:00 akpm@bix.(none) # Merge bk://linux-ntfs.bkbits.net/ntfs-2.6-devel # into bix.(none):/usr/src/bk-ntfs # # fs/ntfs/super.c # 2004/09/14 14:26:26-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/inode.c # 2004/09/14 14:26:26-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/08/27 13:55:53-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-ntfs # # fs/ntfs/super.c # 2004/08/27 13:55:49-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/08/24 17:34:17-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-ntfs # # fs/ntfs/super.c # 2004/08/24 17:34:13-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/08/23 16:42:55-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-ntfs # # fs/ntfs/inode.c # 2004/08/23 16:42:51-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/dir.c # 2004/08/23 16:42:51-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/attrib.c # 2004/08/23 16:42:51-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/aops.c # 2004/08/23 16:42:51-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/08/23 14:26:58-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-ntfs # # fs/ntfs/inode.c # 2004/08/23 14:26:52-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/dir.c # 2004/08/23 14:26:52-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/attrib.c # 2004/08/23 14:26:52-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/aops.c # 2004/08/23 14:26:52-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/08/18 12:24:54-07:00 akpm@bix.(none) # Merge bk://linux-ntfs.bkbits.net/ntfs-2.6-devel # into bix.(none):/usr/src/bk-ntfs # # fs/ntfs/super.c # 2004/08/18 12:24:51-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/08/16 10:41:28-07:00 akpm@bix.(none) # Merge bk://linux-ntfs.bkbits.net/ntfs-2.6-devel # into bix.(none):/usr/src/bk-ntfs # # fs/ntfs/super.c # 2004/08/16 10:41:24-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/08/07 14:39:35-07:00 akpm@bix.(none) # Merge bk://linux-ntfs.bkbits.net/ntfs-2.6-devel # into bix.(none):/usr/src/bk-ntfs # # fs/ntfs/super.c # 2004/08/07 14:39:32-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/dir.c # 2004/08/07 14:39:32-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/compress.c # 2004/08/07 14:39:32-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/07/26 23:13:47-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-ntfs # # fs/ntfs/super.c # 2004/07/26 23:13:44-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/dir.c # 2004/07/26 23:13:43-07:00 akpm@bix.(none) +0 -0 # Auto merged # # fs/ntfs/compress.c # 2004/07/26 23:13:43-07:00 akpm@bix.(none) +0 -0 # Auto merged # diff -Nru a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog --- a/fs/ntfs/ChangeLog 2004-09-26 10:58:46 -07:00 +++ b/fs/ntfs/ChangeLog 2004-09-26 10:58:46 -07:00 @@ -54,6 +54,7 @@ - Fix a bug found by the new sparse bitwise warnings where the default upcase table was defined as a pointer to wchar_t rather than ntfschar in fs/ntfs/ntfs.h and super.c. + - Change {const_,}cpu_to_le{16,32}(0) to just 0 as suggested by Al Viro. 2.1.18 - Fix scheduling latencies at mount time as well as an endianness bug. diff -Nru a/fs/ntfs/dir.c b/fs/ntfs/dir.c --- a/fs/ntfs/dir.c 2004-09-26 10:58:46 -07:00 +++ b/fs/ntfs/dir.c 2004-09-26 10:58:46 -07:00 @@ -28,8 +28,7 @@ * The little endian Unicode string $I30 as a global constant. */ ntfschar I30[5] = { const_cpu_to_le16('$'), const_cpu_to_le16('I'), - const_cpu_to_le16('3'), const_cpu_to_le16('0'), - const_cpu_to_le16(0) }; + const_cpu_to_le16('3'), const_cpu_to_le16('0'), 0 }; /** * ntfs_lookup_inode_by_name - find an inode in a directory given its name diff -Nru a/fs/ntfs/inode.c b/fs/ntfs/inode.c --- a/fs/ntfs/inode.c 2004-09-26 10:58:46 -07:00 +++ b/fs/ntfs/inode.c 2004-09-26 10:58:46 -07:00 @@ -130,7 +130,7 @@ if (!ni->name) return -ENOMEM; memcpy(ni->name, na->name, i); - ni->name[i] = cpu_to_le16(0); + ni->name[i] = 0; } return 0; } diff -Nru a/fs/ntfs/layout.h b/fs/ntfs/layout.h --- a/fs/ntfs/layout.h 2004-09-26 10:58:46 -07:00 +++ b/fs/ntfs/layout.h 2004-09-26 10:58:46 -07:00 @@ -143,13 +143,13 @@ static inline BOOL __ntfs_is_magic(le32 x, NTFS_RECORD_TYPE r) { - return (x == (__force le32)r); + return (x == r); } #define ntfs_is_magic(x, m) __ntfs_is_magic(x, magic_##m) static inline BOOL __ntfs_is_magicp(le32 *p, NTFS_RECORD_TYPE r) { - return (*p == (__force le32)r); + return (*p == r); } #define ntfs_is_magicp(p, m) __ntfs_is_magicp(p, magic_##m) diff -Nru a/fs/ntfs/logfile.h b/fs/ntfs/logfile.h --- a/fs/ntfs/logfile.h 2004-09-26 10:58:46 -07:00 +++ b/fs/ntfs/logfile.h 2004-09-26 10:58:46 -07:00 @@ -111,10 +111,9 @@ * These are the so far known RESTART_AREA_* flags (16-bit) which contain * information about the log file in which they are present. */ -typedef enum { - RESTART_VOLUME_IS_CLEAN = const_cpu_to_le16(0x0002), - REST_AREA_SPACE_FILLER = 0xffff /* Just to make flags 16-bit. */ -} __attribute__ ((__packed__)) RESTART_AREA_FLAGS; +#define RESTART_VOLUME_IS_CLEAN const_cpu_to_le16(0x0002) + +typedef le16 RESTART_AREA_FLAGS; /* * Log file restart area record. The offset of this record is found by adding diff -Nru a/fs/ntfs/mft.c b/fs/ntfs/mft.c --- a/fs/ntfs/mft.c 2004-09-26 10:58:46 -07:00 +++ b/fs/ntfs/mft.c 2004-09-26 10:58:46 -07:00 @@ -47,11 +47,11 @@ *(le16*)((char*)m + ((sizeof(MFT_RECORD) + 1) & ~1)) = cpu_to_le16(1); m->lsn = cpu_to_le64(0LL); m->sequence_number = cpu_to_le16(1); - m->link_count = cpu_to_le16(0); + m->link_count = 0; /* Aligned to 8-byte boundary. */ m->attrs_offset = cpu_to_le16((le16_to_cpu(m->usa_ofs) + (le16_to_cpu(m->usa_count) << 1) + 7) & ~7); - m->flags = cpu_to_le16(0); + m->flags = 0; /* * Using attrs_offset plus eight bytes (for the termination attribute), * aligned to 8-byte boundary. @@ -60,10 +60,10 @@ ~7); m->bytes_allocated = cpu_to_le32(size); m->base_mft_record = cpu_to_le64((MFT_REF)0); - m->next_attr_instance = cpu_to_le16(0); + m->next_attr_instance = 0; a = (ATTR_RECORD*)((char*)m + le16_to_cpu(m->attrs_offset)); a->type = AT_END; - a->length = cpu_to_le32(0); + a->length = 0; } /** diff -Nru a/fs/ntfs/super.c b/fs/ntfs/super.c --- a/fs/ntfs/super.c 2004-09-26 10:58:46 -07:00 +++ b/fs/ntfs/super.c 2004-09-26 10:58:46 -07:00 @@ -1114,9 +1114,9 @@ static const ntfschar Quota[7] = { const_cpu_to_le16('$'), const_cpu_to_le16('Q'), const_cpu_to_le16('u'), const_cpu_to_le16('o'), const_cpu_to_le16('t'), - const_cpu_to_le16('a'), const_cpu_to_le16(0) }; + const_cpu_to_le16('a'), 0 }; static ntfschar Q[3] = { const_cpu_to_le16('$'), - const_cpu_to_le16('Q'), const_cpu_to_le16(0) }; + const_cpu_to_le16('Q'), 0 }; ntfs_debug("Entering."); /* diff -Nru a/fs/ntfs/unistr.c b/fs/ntfs/unistr.c --- a/fs/ntfs/unistr.c 2004-09-26 10:58:46 -07:00 +++ b/fs/ntfs/unistr.c 2004-09-26 10:58:46 -07:00 @@ -276,7 +276,7 @@ } /* else (wc_len < 0) */ goto conversion_err; } - ucs[o] = cpu_to_le16(0); + ucs[o] = 0; *outs = ucs; return o; } /* else (!ucs) */