This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / ntfs / compress.c

diff --git a/fs/ntfs/compress.c b/fs/ntfs/compress.c
index e3c4722..cc3aac1 100644 (file)
--- a/fs/ntfs/compress.c
+++ b/fs/ntfs/compress.c
@@ -24,11 +24,7 @@
 #include <linux/fs.h>
 #include <linux/buffer_head.h>
 #include <linux/blkdev.h>
-#include <linux/vmalloc.h>
 
-#include "attrib.h"
-#include "inode.h"
-#include "debug.h"
 #include "ntfs.h"
 
 /**
@@ -604,9 +600,9 @@ lock_retry_remap:
                        /* Seek to element containing target vcn. */
                        while (rl->length && rl[1].vcn <= vcn)
                                rl++;
-                       lcn = ntfs_rl_vcn_to_lcn(rl, vcn);
+                       lcn = ntfs_vcn_to_lcn(rl, vcn);
                } else
-                       lcn = LCN_RL_NOT_MAPPED;
+                       lcn = (LCN)LCN_RL_NOT_MAPPED;
                ntfs_debug("Reading vcn = 0x%llx, lcn = 0x%llx.",
                                (unsigned long long)vcn,
                                (unsigned long long)lcn);
@@ -930,7 +926,7 @@ map_rl_err:
 
 rl_err:
        up_read(&ni->runlist.lock);
-       ntfs_error(vol->sb, "ntfs_rl_vcn_to_lcn() failed. Cannot read "
+       ntfs_error(vol->sb, "ntfs_vcn_to_lcn() failed. Cannot read "
                        "compression block.");
        goto err_out;