Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 185721
b: refs/heads/master
c: 391e8bb
h: refs/heads/master
i:
  185719: 1b407ef
v: v3
  • Loading branch information
Al Viro committed Mar 3, 2010
1 parent fed2aad commit a48bfeb
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 072f98b4637eddcbdf2178fc84f382e2ee522f08
refs/heads/master: 391e8bbd38474b9f85b1f3933394a79ea66fe1e2
2 changes: 1 addition & 1 deletion trunk/fs/udf/balloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ static void udf_table_free_blocks(struct super_block *sb,
}

if (epos.offset + (2 * adsize) > sb->s_blocksize) {
char *sptr, *dptr;
unsigned char *sptr, *dptr;
int loffset;

brelse(oepos.bh);
Expand Down
4 changes: 2 additions & 2 deletions trunk/fs/udf/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ static int do_udf_readdir(struct inode *dir, struct file *filp,
int block, iblock;
loff_t nf_pos = (filp->f_pos - 1) << 2;
int flen;
char *fname = NULL;
char *nameptr;
unsigned char *fname = NULL;
unsigned char *nameptr;
uint16_t liu;
uint8_t lfi;
loff_t size = udf_ext0_offset(dir) + dir->i_size;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/udf/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -1672,7 +1672,7 @@ int8_t udf_add_aext(struct inode *inode, struct extent_position *epos,
return -1;

if (epos->offset + (2 * adsize) > inode->i_sb->s_blocksize) {
char *sptr, *dptr;
unsigned char *sptr, *dptr;
struct buffer_head *nbh;
int err, loffset;
struct kernel_lb_addr obloc = epos->block;
Expand Down
20 changes: 10 additions & 10 deletions trunk/fs/udf/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
#include <linux/crc-itu-t.h>
#include <linux/exportfs.h>

static inline int udf_match(int len1, const char *name1, int len2,
const char *name2)
static inline int udf_match(int len1, const unsigned char *name1, int len2,
const unsigned char *name2)
{
if (len1 != len2)
return 0;
Expand Down Expand Up @@ -142,15 +142,15 @@ int udf_write_fi(struct inode *inode, struct fileIdentDesc *cfi,
}

static struct fileIdentDesc *udf_find_entry(struct inode *dir,
struct qstr *child,
const struct qstr *child,
struct udf_fileident_bh *fibh,
struct fileIdentDesc *cfi)
{
struct fileIdentDesc *fi = NULL;
loff_t f_pos;
int block, flen;
char *fname = NULL;
char *nameptr;
unsigned char *fname = NULL;
unsigned char *nameptr;
uint8_t lfi;
uint16_t liu;
loff_t size;
Expand Down Expand Up @@ -308,7 +308,7 @@ static struct fileIdentDesc *udf_add_entry(struct inode *dir,
{
struct super_block *sb = dir->i_sb;
struct fileIdentDesc *fi = NULL;
char *name = NULL;
unsigned char *name = NULL;
int namelen;
loff_t f_pos;
loff_t size = udf_ext0_offset(dir) + dir->i_size;
Expand Down Expand Up @@ -885,16 +885,16 @@ static int udf_symlink(struct inode *dir, struct dentry *dentry,
{
struct inode *inode;
struct pathComponent *pc;
char *compstart;
const char *compstart;
struct udf_fileident_bh fibh;
struct extent_position epos = {};
int eoffset, elen = 0;
struct fileIdentDesc *fi;
struct fileIdentDesc cfi;
char *ea;
uint8_t *ea;
int err;
int block;
char *name = NULL;
unsigned char *name = NULL;
int namelen;
struct buffer_head *bh;
struct udf_inode_info *iinfo;
Expand Down Expand Up @@ -970,7 +970,7 @@ static int udf_symlink(struct inode *dir, struct dentry *dentry,

pc = (struct pathComponent *)(ea + elen);

compstart = (char *)symname;
compstart = symname;

do {
symname++;
Expand Down
10 changes: 5 additions & 5 deletions trunk/fs/udf/symlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
#include <linux/buffer_head.h>
#include "udf_i.h"

static void udf_pc_to_char(struct super_block *sb, char *from, int fromlen,
char *to)
static void udf_pc_to_char(struct super_block *sb, unsigned char *from,
int fromlen, unsigned char *to)
{
struct pathComponent *pc;
int elen = 0;
char *p = to;
unsigned char *p = to;

while (elen < fromlen) {
pc = (struct pathComponent *)(from + elen);
Expand Down Expand Up @@ -75,9 +75,9 @@ static int udf_symlink_filler(struct file *file, struct page *page)
{
struct inode *inode = page->mapping->host;
struct buffer_head *bh = NULL;
char *symlink;
unsigned char *symlink;
int err = -EIO;
char *p = kmap(page);
unsigned char *p = kmap(page);
struct udf_inode_info *iinfo;

lock_kernel();
Expand Down

0 comments on commit a48bfeb

Please sign in to comment.