vserver 1.9.3

[linux-2.6.git] / fs / udf / truncate.c

diff --git a/fs/udf/truncate.c b/fs/udf/truncate.c
index b51ea9c..7dc8a55 100644 (file)
--- a/fs/udf/truncate.c
+++ b/fs/udf/truncate.c
@@ -33,10 +33,10 @@
 #include "udf_i.h"
 #include "udf_sb.h"
 
-static void extent_trunc(struct inode * inode, lb_addr bloc, int extoffset,
-       lb_addr eloc, int8_t etype, uint32_t elen, struct buffer_head *bh, uint32_t nelen)
+static void extent_trunc(struct inode * inode, kernel_lb_addr bloc, int extoffset,
+       kernel_lb_addr eloc, int8_t etype, uint32_t elen, struct buffer_head *bh, uint32_t nelen)
 {
-       lb_addr neloc = { 0, 0 };
+       kernel_lb_addr neloc = { 0, 0 };
        int last_block = (elen + inode->i_sb->s_blocksize - 1) >> inode->i_sb->s_blocksize_bits;
        int first_block = (nelen + inode->i_sb->s_blocksize - 1) >> inode->i_sb->s_blocksize_bits;
 
@@ -68,7 +68,7 @@ static void extent_trunc(struct inode * inode, lb_addr bloc, int extoffset,
 
 void udf_discard_prealloc(struct inode * inode)
 {
-       lb_addr bloc, eloc;
+       kernel_lb_addr bloc, eloc;
        uint32_t extoffset = 0, elen, nelen;
        uint64_t lbcount = 0;
        int8_t etype = -1, netype;
@@ -129,7 +129,7 @@ void udf_discard_prealloc(struct inode * inode)
 
 void udf_truncate_extents(struct inode * inode)
 {
-       lb_addr bloc, eloc, neloc = { 0, 0 };
+       kernel_lb_addr bloc, eloc, neloc = { 0, 0 };
        uint32_t extoffset, elen, offset, nelen = 0, lelen = 0, lenalloc;
        int8_t etype;
        int first_block = inode->i_size >> inode->i_sb->s_blocksize_bits;
@@ -254,7 +254,7 @@ void udf_truncate_extents(struct inode * inode)
                        }
                        else if (etype == (EXT_NOT_RECORDED_ALLOCATED >> 30))
                        {
-                               lb_addr neloc = { 0, 0 };
+                               kernel_lb_addr neloc = { 0, 0 };
                                extoffset -= adsize;
                                nelen = EXT_NOT_RECORDED_NOT_ALLOCATED |
                                        ((elen + offset + inode->i_sb->s_blocksize - 1) &
@@ -272,7 +272,7 @@ void udf_truncate_extents(struct inode * inode)
                                                ~(inode->i_sb->s_blocksize - 1));
                                        udf_write_aext(inode, bloc, &extoffset, eloc, elen, bh, 1);
                                }
-                               memset(&eloc, 0x00, sizeof(lb_addr));
+                               memset(&eloc, 0x00, sizeof(kernel_lb_addr));
                                elen = EXT_NOT_RECORDED_NOT_ALLOCATED | offset;
                                udf_add_aext(inode, &bloc, &extoffset, eloc, elen, &bh, 1);
                        }