git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
fs
/
ntfs
/
collate.h
diff --git
a/fs/ntfs/collate.h
b/fs/ntfs/collate.h
index
e027f36
..
aba8334
100644
(file)
--- a/
fs/ntfs/collate.h
+++ b/
fs/ntfs/collate.h
@@
-26,7
+26,7
@@
#include "types.h"
#include "volume.h"
#include "types.h"
#include "volume.h"
-static inline
BOOL
ntfs_is_collation_rule_supported(COLLATION_RULE cr) {
+static inline
bool
ntfs_is_collation_rule_supported(COLLATION_RULE cr) {
int i;
/*
int i;
/*
@@
-35,12
+35,12
@@
static inline BOOL ntfs_is_collation_rule_supported(COLLATION_RULE cr) {
* now.
*/
if (unlikely(cr != COLLATION_BINARY && cr != COLLATION_NTOFS_ULONG))
* now.
*/
if (unlikely(cr != COLLATION_BINARY && cr != COLLATION_NTOFS_ULONG))
- return
FALSE
;
+ return
false
;
i = le32_to_cpu(cr);
if (likely(((i >= 0) && (i <= 0x02)) ||
((i >= 0x10) && (i <= 0x13))))
i = le32_to_cpu(cr);
if (likely(((i >= 0) && (i <= 0x02)) ||
((i >= 0x10) && (i <= 0x13))))
- return
TRUE
;
- return
FALSE
;
+ return
true
;
+ return
false
;
}
extern int ntfs_collate(ntfs_volume *vol, COLLATION_RULE cr,
}
extern int ntfs_collate(ntfs_volume *vol, COLLATION_RULE cr,