Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / affs / inode.c

diff --git a/fs/affs/inode.c b/fs/affs/inode.c
index 37aca8f..44d439c 100644 (file)
--- a/fs/affs/inode.c
+++ b/fs/affs/inode.c
@@ -10,26 +10,7 @@
  *  (C) 1991  Linus Torvalds - minix filesystem
  */
 
-#include <asm/div64.h>
-#include <linux/errno.h>
-#include <linux/fs.h>
-#include <linux/slab.h>
-#include <linux/stat.h>
-#include <linux/time.h>
-#include <linux/affs_fs.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/genhd.h>
-#include <linux/amigaffs.h>
-#include <linux/major.h>
-#include <linux/blkdev.h>
-#include <linux/init.h>
-#include <linux/smp_lock.h>
-#include <linux/buffer_head.h>
-#include <asm/system.h>
-#include <asm/uaccess.h>
-#include <linux/module.h>
+#include "affs.h"
 
 extern struct inode_operations affs_symlink_inode_operations;
 extern struct timezone sys_tz;
@@ -181,7 +162,7 @@ bad_inode:
        return;
 }
 
-void
+int
 affs_write_inode(struct inode *inode, int unused)
 {
        struct super_block      *sb = inode->i_sb;
@@ -194,14 +175,14 @@ affs_write_inode(struct inode *inode, int unused)
 
        if (!inode->i_nlink)
                // possibly free block
-               return;
+               return 0;
        bh = affs_bread(sb, inode->i_ino);
        if (!bh) {
                affs_error(sb,"write_inode","Cannot read block %lu",inode->i_ino);
-               return;
+               return -EIO;
        }
        tail = AFFS_TAIL(sb, bh);
-       if (tail->stype == be32_to_cpu(ST_ROOT)) {
+       if (tail->stype == cpu_to_be32(ST_ROOT)) {
                secs_to_datestamp(inode->i_mtime.tv_sec,&AFFS_ROOT_TAIL(sb, bh)->root_change);
        } else {
                tail->protect = cpu_to_be32(AFFS_I(inode)->i_protect);
@@ -226,6 +207,7 @@ affs_write_inode(struct inode *inode, int unused)
        mark_buffer_dirty_inode(bh, inode);
        affs_brelse(bh);
        affs_free_prealloc(inode);
+       return 0;
 }
 
 int
@@ -249,7 +231,7 @@ affs_notify_change(struct dentry *dentry, struct iattr *attr)
                goto out;
        }
 
-       inode_setattr(inode, attr);
+       error = inode_setattr(inode, attr);
        if (!error && (attr->ia_valid & ATTR_MODE))
                mode_to_prot(inode);
 out:
@@ -262,10 +244,10 @@ affs_put_inode(struct inode *inode)
        pr_debug("AFFS: put_inode(ino=%lu, nlink=%u)\n", inode->i_ino, inode->i_nlink);
        affs_free_prealloc(inode);
        if (atomic_read(&inode->i_count) == 1) {
-               down(&inode->i_sem);
+               mutex_lock(&inode->i_mutex);
                if (inode->i_size != AFFS_I(inode)->mmu_private)
                        affs_truncate(inode);
-               up(&inode->i_sem);
+               mutex_unlock(&inode->i_mutex);
        }
 }
 
@@ -273,6 +255,7 @@ void
 affs_delete_inode(struct inode *inode)
 {
        pr_debug("AFFS: delete_inode(ino=%lu, nlink=%u)\n", inode->i_ino, inode->i_nlink);
+       truncate_inode_pages(&inode->i_data, 0);
        inode->i_size = 0;
        if (S_ISREG(inode->i_mode))
                affs_truncate(inode);
@@ -321,7 +304,7 @@ affs_new_inode(struct inode *dir)
        inode->i_gid     = current->fsgid;
        inode->i_ino     = block;
        inode->i_nlink   = 1;
-       inode->i_mtime   = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+       inode->i_mtime   = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
        AFFS_I(inode)->i_opencnt = 0;
        AFFS_I(inode)->i_blkcnt = 0;
        AFFS_I(inode)->i_lc = NULL;
@@ -396,7 +379,7 @@ affs_add_entry(struct inode *dir, struct inode *inode, struct dentry *dentry, s3
        AFFS_TAIL(sb, bh)->parent = cpu_to_be32(dir->i_ino);
 
        if (inode_bh) {
-               u32 chain;
+               __be32 chain;
                chain = AFFS_TAIL(sb, inode_bh)->link_chain;
                AFFS_TAIL(sb, bh)->original = cpu_to_be32(inode->i_ino);
                AFFS_TAIL(sb, bh)->link_chain = chain;
@@ -427,4 +410,3 @@ err:
        affs_unlock_link(inode);
        goto done;
 }
-MODULE_LICENSE("GPL");