From 3e5f2b19f20403c0834a3c1fa480a70a55e528dc Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 26 Jul 2011 03:04:30 -0400 Subject: [PATCH] --- yaml --- r: 280243 b: refs/heads/master c: a760b03dc0ac4c9663577ca45de5e0fe1c35dc13 h: refs/heads/master i: 280241: afc55ec617ab6eae2c48e3c1a30addc18409c8aa 280239: 0a91efc4df0e816b7bce5d9075291f5db6600178 v: v3 --- [refs] | 2 +- trunk/fs/affs/affs.h | 2 +- trunk/fs/affs/amigaffs.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b3e787ac7dee..90554901cb46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5e7ed3287e45f2eafbcf9e7e6fdc5a0191acf40 +refs/heads/master: a760b03dc0ac4c9663577ca45de5e0fe1c35dc13 diff --git a/trunk/fs/affs/affs.h b/trunk/fs/affs/affs.h index 9cad9b4a9af7..45a0ce45d7b4 100644 --- a/trunk/fs/affs/affs.h +++ b/trunk/fs/affs/affs.h @@ -136,7 +136,7 @@ extern int affs_remove_header(struct dentry *dentry); extern u32 affs_checksum_block(struct super_block *sb, struct buffer_head *bh); extern void affs_fix_checksum(struct super_block *sb, struct buffer_head *bh); extern void secs_to_datestamp(time_t secs, struct affs_date *ds); -extern mode_t prot_to_mode(u32 prot); +extern umode_t prot_to_mode(u32 prot); extern void mode_to_prot(struct inode *inode); extern void affs_error(struct super_block *sb, const char *function, const char *fmt, ...); extern void affs_warning(struct super_block *sb, const char *function, const char *fmt, ...); diff --git a/trunk/fs/affs/amigaffs.c b/trunk/fs/affs/amigaffs.c index de37ec842340..52a6407682e6 100644 --- a/trunk/fs/affs/amigaffs.c +++ b/trunk/fs/affs/amigaffs.c @@ -390,10 +390,10 @@ secs_to_datestamp(time_t secs, struct affs_date *ds) ds->ticks = cpu_to_be32(secs * 50); } -mode_t +umode_t prot_to_mode(u32 prot) { - int mode = 0; + umode_t mode = 0; if (!(prot & FIBF_NOWRITE)) mode |= S_IWUSR; @@ -421,7 +421,7 @@ void mode_to_prot(struct inode *inode) { u32 prot = AFFS_I(inode)->i_protect; - mode_t mode = inode->i_mode; + umode_t mode = inode->i_mode; if (!(mode & S_IXUSR)) prot |= FIBF_NOEXECUTE;