diff options
author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-19 13:46:53 -0500 |
---|---|---|
committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-19 13:46:53 -0500 |
commit | 21d1ee8b375bcd180f1d6b8ccbb8d8f938596310 (patch) | |
tree | 2e82b65c16a4aaa88eeb7dd9f47f2d1c418e77d0 /fs/ntfs/logfile.c | |
parent | 3d9b1cdd2455017c6aa25bc2442092b81438981f (diff) | |
parent | f60f700876cd51de9de69f3a3c865d95e287a24d (diff) | |
download | kernel_samsung_smdk4412-21d1ee8b375bcd180f1d6b8ccbb8d8f938596310.zip kernel_samsung_smdk4412-21d1ee8b375bcd180f1d6b8ccbb8d8f938596310.tar.gz kernel_samsung_smdk4412-21d1ee8b375bcd180f1d6b8ccbb8d8f938596310.tar.bz2 |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'fs/ntfs/logfile.c')
-rw-r--r-- | fs/ntfs/logfile.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/ntfs/logfile.c b/fs/ntfs/logfile.c index 5e280ab..8edb8e2 100644 --- a/fs/ntfs/logfile.c +++ b/fs/ntfs/logfile.c @@ -1,7 +1,7 @@ /* * logfile.c - NTFS kernel journal handling. Part of the Linux-NTFS project. * - * Copyright (c) 2002-2004 Anton Altaparmakov + * Copyright (c) 2002-2005 Anton Altaparmakov * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -410,7 +410,7 @@ err_out: } /** - * ntfs_ckeck_logfile - check in the journal if the volume is consistent + * ntfs_check_logfile - check the journal for consistency * @log_vi: struct inode of loaded journal $LogFile to check * * Check the $LogFile journal for consistency and return TRUE if it is @@ -443,7 +443,7 @@ BOOL ntfs_check_logfile(struct inode *log_vi) /* An empty $LogFile must have been clean before it got emptied. */ if (NVolLogFileEmpty(vol)) goto is_empty; - size = log_vi->i_size; + size = i_size_read(log_vi); /* Make sure the file doesn't exceed the maximum allowed size. */ if (size > MaxLogFileSize) size = MaxLogFileSize; @@ -464,7 +464,7 @@ BOOL ntfs_check_logfile(struct inode *log_vi) * optimize log_page_size and log_page_bits into constants. */ log_page_bits = generic_ffs(log_page_size) - 1; - size &= ~(log_page_size - 1); + size &= ~(s64)(log_page_size - 1); /* * Ensure the log file is big enough to store at least the two restart * pages and the minimum number of log record pages. @@ -689,7 +689,8 @@ BOOL ntfs_empty_logfile(struct inode *log_vi) if (!NVolLogFileEmpty(vol)) { int err; - err = ntfs_attr_set(NTFS_I(log_vi), 0, log_vi->i_size, 0xff); + err = ntfs_attr_set(NTFS_I(log_vi), 0, i_size_read(log_vi), + 0xff); if (unlikely(err)) { ntfs_error(vol->sb, "Failed to fill $LogFile with " "0xff bytes (error code %i).", err); |