drm/fb: use printk to print out the switching to text mode error.

[safe/jmp/linux-2.6] / fs / udf / directory.c

diff --git a/fs/udf/directory.c b/fs/udf/directory.c
index be16d76..2ffdb67 100644 (file)
--- a/fs/udf/directory.c
+++ b/fs/udf/directory.c
@@ -18,64 +18,11 @@
 #include <linux/string.h>
 #include <linux/buffer_head.h>
 
-#if 0
-static uint8_t *udf_filead_read(struct inode *dir, uint8_t *tmpad,
-                               uint8_t ad_size, kernel_lb_addr fe_loc,
-                               int *pos, int *offset, struct buffer_head **bh,
-                               int *error)
-{
-       int loffset = *offset;
-       int block;
-       uint8_t *ad;
-       int remainder;
-
-       *error = 0;
-
-       ad = (uint8_t *)(*bh)->b_data + *offset;
-       *offset += ad_size;
-
-       if (!ad) {
-               brelse(*bh);
-               *error = 1;
-               return NULL;
-       }
-
-       if (*offset == dir->i_sb->s_blocksize) {
-               brelse(*bh);
-               block = udf_get_lb_pblock(dir->i_sb, fe_loc, ++*pos);
-               if (!block)
-                       return NULL;
-               *bh = udf_tread(dir->i_sb, block);
-               if (!*bh)
-                       return NULL;
-       } else if (*offset > dir->i_sb->s_blocksize) {
-               ad = tmpad;
-
-               remainder = dir->i_sb->s_blocksize - loffset;
-               memcpy((uint8_t *)ad, (*bh)->b_data + loffset, remainder);
-
-               brelse(*bh);
-               block = udf_get_lb_pblock(dir->i_sb, fe_loc, ++*pos);
-               if (!block)
-                       return NULL;
-               (*bh) = udf_tread(dir->i_sb, block);
-               if (!*bh)
-                       return NULL;
-
-               memcpy((uint8_t *)ad + remainder, (*bh)->b_data,
-                       ad_size - remainder);
-               *offset = ad_size - remainder;
-       }
-
-       return ad;
-}
-#endif
-
 struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos,
                                         struct udf_fileident_bh *fibh,
                                         struct fileIdentDesc *cfi,
                                         struct extent_position *epos,
-                                        kernel_lb_addr *eloc, uint32_t *elen,
+                                        struct kernel_lb_addr *eloc, uint32_t *elen,
                                         sector_t *offset)
 {
        struct fileIdentDesc *fi;
@@ -95,7 +42,7 @@ struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos,
                if (!fi)
                        return NULL;
 
-               *nf_pos += ((fibh->eoffset - fibh->soffset) >> 2);
+               *nf_pos += fibh->eoffset - fibh->soffset;
 
                memcpy((uint8_t *)cfi, (uint8_t *)fi,
                       sizeof(struct fileIdentDesc));
@@ -111,7 +58,7 @@ struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos,
                    (EXT_RECORDED_ALLOCATED >> 30))
                        return NULL;
 
-               block = udf_get_lb_pblock(dir->i_sb, *eloc, *offset);
+               block = udf_get_lb_pblock(dir->i_sb, eloc, *offset);
 
                (*offset)++;
 
@@ -131,7 +78,7 @@ struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos,
                        if (i + *offset > (*elen >> blocksize_bits))
                                i = (*elen >> blocksize_bits)-*offset;
                        for (num = 0; i > 0; i--) {
-                               block = udf_get_lb_pblock(dir->i_sb, *eloc,
+                               block = udf_get_lb_pblock(dir->i_sb, eloc,
                                                          *offset + i);
                                tmp = udf_tgetblk(dir->i_sb, block);
                                if (tmp && !buffer_uptodate(tmp) &&
@@ -157,7 +104,7 @@ struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos,
        if (!fi)
                return NULL;
 
-       *nf_pos += ((fibh->eoffset - fibh->soffset) >> 2);
+       *nf_pos += fibh->eoffset - fibh->soffset;
 
        if (fibh->eoffset <= dir->i_sb->s_blocksize) {
                memcpy((uint8_t *)cfi, (uint8_t *)fi,
@@ -169,7 +116,7 @@ struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos,
                    (EXT_RECORDED_ALLOCATED >> 30))
                        return NULL;
 
-               block = udf_get_lb_pblock(dir->i_sb, *eloc, *offset);
+               block = udf_get_lb_pblock(dir->i_sb, eloc, *offset);
 
                (*offset)++;
 
@@ -197,8 +144,7 @@ struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos,
                                  cfi->lengthFileIdent +
                                  le16_to_cpu(cfi->lengthOfImpUse) + 3) & ~3;
 
-                       *nf_pos += (fi_len - (fibh->eoffset - fibh->soffset))
-                                       >> 2;
+                       *nf_pos += fi_len - (fibh->eoffset - fibh->soffset);
                        fibh->eoffset = fibh->soffset + fi_len;
                } else {
                        memcpy((uint8_t *)cfi, (uint8_t *)fi,
@@ -249,80 +195,47 @@ struct fileIdentDesc *udf_get_fileident(void *buffer, int bufsize, int *offset)
        return fi;
 }
 
-#if 0
-static extent_ad *udf_get_fileextent(void *buffer, int bufsize, int *offset)
-{
-       extent_ad *ext;
-       struct fileEntry *fe;
-       uint8_t *ptr;
-
-       if ((!buffer) || (!offset)) {
-               printk(KERN_ERR "udf: udf_get_fileextent() invalidparms\n");
-               return NULL;
-       }
-
-       fe = (struct fileEntry *)buffer;
-
-       if (fe->descTag.tagIdent != cpu_to_le16(TAG_IDENT_FE)) {
-               udf_debug("0x%x != TAG_IDENT_FE\n",
-                         le16_to_cpu(fe->descTag.tagIdent));
-               return NULL;
-       }
-
-       ptr = (uint8_t *)(fe->extendedAttr) +
-               le32_to_cpu(fe->lengthExtendedAttr);
-
-       if ((*offset > 0) && (*offset < le32_to_cpu(fe->lengthAllocDescs)))
-               ptr += *offset;
-
-       ext = (extent_ad *)ptr;
-
-       *offset = *offset + sizeof(extent_ad);
-       return ext;
-}
-#endif
-
-short_ad *udf_get_fileshortad(uint8_t *ptr, int maxoffset, uint32_t *offset,
+struct short_ad *udf_get_fileshortad(uint8_t *ptr, int maxoffset, uint32_t *offset,
                              int inc)
 {
-       short_ad *sa;
+       struct short_ad *sa;
 
        if ((!ptr) || (!offset)) {
                printk(KERN_ERR "udf: udf_get_fileshortad() invalidparms\n");
                return NULL;
        }
 
-       if ((*offset + sizeof(short_ad)) > maxoffset)
+       if ((*offset + sizeof(struct short_ad)) > maxoffset)
                return NULL;
        else {
-               sa = (short_ad *)ptr;
+               sa = (struct short_ad *)ptr;
                if (sa->extLength == 0)
                        return NULL;
        }
 
        if (inc)
-               *offset += sizeof(short_ad);
+               *offset += sizeof(struct short_ad);
        return sa;
 }
 
-long_ad *udf_get_filelongad(uint8_t *ptr, int maxoffset, uint32_t *offset, int inc)
+struct long_ad *udf_get_filelongad(uint8_t *ptr, int maxoffset, uint32_t *offset, int inc)
 {
-       long_ad *la;
+       struct long_ad *la;
 
        if ((!ptr) || (!offset)) {
                printk(KERN_ERR "udf: udf_get_filelongad() invalidparms\n");
                return NULL;
        }
 
-       if ((*offset + sizeof(long_ad)) > maxoffset)
+       if ((*offset + sizeof(struct long_ad)) > maxoffset)
                return NULL;
        else {
-               la = (long_ad *)ptr;
+               la = (struct long_ad *)ptr;
                if (la->extLength == 0)
                        return NULL;
        }
 
        if (inc)
-               *offset += sizeof(long_ad);
+               *offset += sizeof(struct long_ad);
        return la;
 }