Merge branch 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...

[linux-2.6-omap-h63xx.git] / fs / ntfs / logfile.c

diff --git a/fs/ntfs/logfile.c b/fs/ntfs/logfile.c
index 0fd70295cca67347694d815e85e335c25efb2b68..4af2ad1193ec374288f0f803ce7bf3b05ee9da62 100644 (file)
--- a/fs/ntfs/logfile.c
+++ b/fs/ntfs/logfile.c
@@ -515,10 +515,10 @@ BOOL ntfs_check_logfile(struct inode *log_vi, RESTART_PAGE_HEADER **rp)
                log_page_size = PAGE_CACHE_SIZE;
        log_page_mask = log_page_size - 1;
        /*
-        * Use generic_ffs() instead of ffs() to enable the compiler to
+        * Use ntfs_ffs() instead of ffs() to enable the compiler to
         * optimize log_page_size and log_page_bits into constants.
         */
-       log_page_bits = generic_ffs(log_page_size) - 1;
+       log_page_bits = ntfs_ffs(log_page_size) - 1;
        size &= ~(s64)(log_page_size - 1);
        /*
         * Ensure the log file is big enough to store at least the two restart