Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm

[~andy/linux] / fs / affs / amigaffs.c

diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
index 3a4557e8325c1cccad9b0498fb0dd0617ed1e589..52a6407682e65e1aa0c82805c2d052cc09b20361 100644 (file)
--- a/fs/affs/amigaffs.c
+++ b/fs/affs/amigaffs.c
@@ -215,7 +215,7 @@ affs_remove_link(struct dentry *dentry)
                                break;
                        default:
                                if (!AFFS_TAIL(sb, bh)->link_chain)
-                                       inode->i_nlink = 1;
+                                       set_nlink(inode, 1);
                        }
                        affs_free_block(sb, link_ino);
                        goto done;
@@ -316,7 +316,7 @@ affs_remove_header(struct dentry *dentry)
        if (inode->i_nlink > 1)
                retval = affs_remove_link(dentry);
        else
-               inode->i_nlink = 0;
+               clear_nlink(inode);
        affs_unlock_link(inode);
        inode->i_ctime = CURRENT_TIME_SEC;
        mark_inode_dirty(inode);
@@ -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;