---

yaml --- r: 139187 b: refs/heads/master c: 63cd885 h: refs/heads/master i: 139185: 2a6fce9 139183: 261ea5d v: v3
git-mirror · Apr 1, 2009 · 916347e · 916347e
1 parent aee41b2
commit 916347e
Show file tree

Hide file tree

Showing 8 changed files with 216 additions and 228 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 311d07611e8b354cc1ee6546e4c574c01111adc8
+refs/heads/master: 63cd885426872254e82dac2d9e13ea4f720c21dc
diff --git a/trunk/fs/ntfs/dir.c b/trunk/fs/ntfs/dir.c
@@ -32,8 +32,8 @@
 /**
  * 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'), 0 };
+ntfschar I30[5] = { cpu_to_le16('$'), cpu_to_le16('I'),
+		cpu_to_le16('3'),	cpu_to_le16('0'), 0 };
 
 /**
  * ntfs_lookup_inode_by_name - find an inode in a directory given its name

diff --git a/trunk/fs/ntfs/inode.c b/trunk/fs/ntfs/inode.c
@@ -1975,8 +1975,7 @@ int ntfs_read_inode_mount(struct inode *vi)
 				goto em_put_err_out;
 			next_al_entry = (ATTR_LIST_ENTRY*)((u8*)al_entry +
 					le16_to_cpu(al_entry->length));
-			if (le32_to_cpu(al_entry->type) >
-					const_le32_to_cpu(AT_DATA))
+			if (le32_to_cpu(al_entry->type) > le32_to_cpu(AT_DATA))
 				goto em_put_err_out;
 			if (AT_DATA != al_entry->type)
 				continue;