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
/
usnjrnl.c
diff --git
a/fs/ntfs/usnjrnl.c
b/fs/ntfs/usnjrnl.c
index
7777324
..
b2bc0d5
100644
(file)
--- a/
fs/ntfs/usnjrnl.c
+++ b/
fs/ntfs/usnjrnl.c
@@
-39,12
+39,12
@@
* @vol: ntfs volume on which to stamp the transaction log
*
* Stamp the transaction log ($UsnJrnl) on the ntfs volume @vol and return
* @vol: ntfs volume on which to stamp the transaction log
*
* Stamp the transaction log ($UsnJrnl) on the ntfs volume @vol and return
- *
TRUE on success and FALSE
on error.
+ *
'true' on success and 'false'
on error.
*
* This function assumes that the transaction log has already been loaded and
* consistency checked by a call to fs/ntfs/super.c::load_and_init_usnjrnl().
*/
*
* This function assumes that the transaction log has already been loaded and
* consistency checked by a call to fs/ntfs/super.c::load_and_init_usnjrnl().
*/
-
BOOL
ntfs_stamp_usnjrnl(ntfs_volume *vol)
+
bool
ntfs_stamp_usnjrnl(ntfs_volume *vol)
{
ntfs_debug("Entering.");
if (likely(!NVolUsnJrnlStamped(vol))) {
{
ntfs_debug("Entering.");
if (likely(!NVolUsnJrnlStamped(vol))) {
@@
-56,7
+56,7
@@
BOOL ntfs_stamp_usnjrnl(ntfs_volume *vol)
if (IS_ERR(page)) {
ntfs_error(vol->sb, "Failed to read from "
"$UsnJrnl/$DATA/$Max attribute.");
if (IS_ERR(page)) {
ntfs_error(vol->sb, "Failed to read from "
"$UsnJrnl/$DATA/$Max attribute.");
- return
FALSE
;
+ return
false
;
}
uh = (USN_HEADER*)page_address(page);
stamp = get_current_ntfs_time();
}
uh = (USN_HEADER*)page_address(page);
stamp = get_current_ntfs_time();
@@
-78,7
+78,7
@@
BOOL ntfs_stamp_usnjrnl(ntfs_volume *vol)
NVolSetUsnJrnlStamped(vol);
}
ntfs_debug("Done.");
NVolSetUsnJrnlStamped(vol);
}
ntfs_debug("Done.");
- return
TRUE
;
+ return
true
;
}
#endif /* NTFS_RW */
}
#endif /* NTFS_RW */