4 files changed, 320 insertions, 78 deletions

diff --git a/fs/adfs/dir_f.c b/fs/adfs/dir_f.c
index bbfc86259272..b9b2b27b68c3 100644
--- a/fs/adfs/dir_f.c
+++ b/fs/adfs/dir_f.c
@@ -53,7 +53,7 @@ static inline int adfs_readname(char *buf, char *ptr, int maxlen)
 {
         char *old_buf = buf;
 
-        while (*ptr >= ' ' && maxlen--) {
+        while ((unsigned char)*ptr >= ' ' && maxlen--) {
                 if (*ptr == '/')
                         *buf++ = '.';
                 else
diff --git a/fs/bad_inode.c b/fs/bad_inode.c
index 34e6d7b220c3..869f5193ecc2 100644
--- a/fs/bad_inode.c
+++ b/fs/bad_inode.c
@@ -14,59 +14,307 @@
 #include <linux/time.h>
 #include <linux/smp_lock.h>
 #include <linux/namei.h>
+#include <linux/poll.h>
 
-static int return_EIO(void)
+
+static loff_t bad_file_llseek(struct file *file, loff_t offset, int origin)
+{
+        return -EIO;
+}
+
+static ssize_t bad_file_read(struct file *filp, char __user *buf,
+                        size_t size, loff_t *ppos)
+{
+        return -EIO;
+}
+
+static ssize_t bad_file_write(struct file *filp, const char __user *buf,
+                        size_t siz, loff_t *ppos)
+{
+        return -EIO;
+}
+
+static ssize_t bad_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
+                        unsigned long nr_segs, loff_t pos)
+{
+        return -EIO;
+}
+
+static ssize_t bad_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
+                        unsigned long nr_segs, loff_t pos)
+{
+        return -EIO;
+}
+
+static int bad_file_readdir(struct file *filp, void *dirent, filldir_t filldir)
+{
+        return -EIO;
+}
+
+static unsigned int bad_file_poll(struct file *filp, poll_table *wait)
+{
+        return POLLERR;
+}
+
+static int bad_file_ioctl (struct inode *inode, struct file *filp,
+                        unsigned int cmd, unsigned long arg)
+{
+        return -EIO;
+}
+
+static long bad_file_unlocked_ioctl(struct file *file, unsigned cmd,
+                        unsigned long arg)
+{
+        return -EIO;
+}
+
+static long bad_file_compat_ioctl(struct file *file, unsigned int cmd,
+                        unsigned long arg)
+{
+        return -EIO;
+}
+
+static int bad_file_mmap(struct file *file, struct vm_area_struct *vma)
+{
+        return -EIO;
+}
+
+static int bad_file_open(struct inode *inode, struct file *filp)
+{
+        return -EIO;
+}
+
+static int bad_file_flush(struct file *file, fl_owner_t id)
+{
+        return -EIO;
+}
+
+static int bad_file_release(struct inode *inode, struct file *filp)
+{
+        return -EIO;
+}
+
+static int bad_file_fsync(struct file *file, struct dentry *dentry,
+                        int datasync)
+{
+        return -EIO;
+}
+
+static int bad_file_aio_fsync(struct kiocb *iocb, int datasync)
+{
+        return -EIO;
+}
+
+static int bad_file_fasync(int fd, struct file *filp, int on)
+{
+        return -EIO;
+}
+
+static int bad_file_lock(struct file *file, int cmd, struct file_lock *fl)
+{
+        return -EIO;
+}
+
+static ssize_t bad_file_sendfile(struct file *in_file, loff_t *ppos,
+                        size_t count, read_actor_t actor, void *target)
+{
+        return -EIO;
+}
+
+static ssize_t bad_file_sendpage(struct file *file, struct page *page,
+                        int off, size_t len, loff_t *pos, int more)
+{
+        return -EIO;
+}
+
+static unsigned long bad_file_get_unmapped_area(struct file *file,
+                                unsigned long addr, unsigned long len,
+                                unsigned long pgoff, unsigned long flags)
+{
+        return -EIO;
+}
+
+static int bad_file_check_flags(int flags)
 {
         return -EIO;
 }
 
-#define EIO_ERROR ((void *) (return_EIO))
+static int bad_file_dir_notify(struct file *file, unsigned long arg)
+{
+        return -EIO;
+}
+
+static int bad_file_flock(struct file *filp, int cmd, struct file_lock *fl)
+{
+        return -EIO;
+}
+
+static ssize_t bad_file_splice_write(struct pipe_inode_info *pipe,
+                        struct file *out, loff_t *ppos, size_t len,
+                        unsigned int flags)
+{
+        return -EIO;
+}
+
+static ssize_t bad_file_splice_read(struct file *in, loff_t *ppos,
+                        struct pipe_inode_info *pipe, size_t len,
+                        unsigned int flags)
+{
+        return -EIO;
+}
 
 static const struct file_operations bad_file_ops =
 {
-        .llseek         = EIO_ERROR,
-        .aio_read       = EIO_ERROR,
-        .read           = EIO_ERROR,
-        .write          = EIO_ERROR,
-        .aio_write      = EIO_ERROR,
-        .readdir        = EIO_ERROR,
-        .poll           = EIO_ERROR,
-        .ioctl          = EIO_ERROR,
-        .mmap           = EIO_ERROR,
-        .open           = EIO_ERROR,
-        .flush          = EIO_ERROR,
-        .release        = EIO_ERROR,
-        .fsync          = EIO_ERROR,
-        .aio_fsync      = EIO_ERROR,
-        .fasync         = EIO_ERROR,
-        .lock           = EIO_ERROR,
-        .sendfile       = EIO_ERROR,
-        .sendpage       = EIO_ERROR,
-        .get_unmapped_area = EIO_ERROR,
+        .llseek         = bad_file_llseek,
+        .read           = bad_file_read,
+        .write          = bad_file_write,
+        .aio_read       = bad_file_aio_read,
+        .aio_write      = bad_file_aio_write,
+        .readdir        = bad_file_readdir,
+        .poll           = bad_file_poll,
+        .ioctl          = bad_file_ioctl,
+        .unlocked_ioctl = bad_file_unlocked_ioctl,
+        .compat_ioctl   = bad_file_compat_ioctl,
+        .mmap           = bad_file_mmap,
+        .open           = bad_file_open,
+        .flush          = bad_file_flush,
+        .release        = bad_file_release,
+        .fsync          = bad_file_fsync,
+        .aio_fsync      = bad_file_aio_fsync,
+        .fasync         = bad_file_fasync,
+        .lock           = bad_file_lock,
+        .sendfile       = bad_file_sendfile,
+        .sendpage       = bad_file_sendpage,
+        .get_unmapped_area = bad_file_get_unmapped_area,
+        .check_flags    = bad_file_check_flags,
+        .dir_notify     = bad_file_dir_notify,
+        .flock          = bad_file_flock,
+        .splice_write   = bad_file_splice_write,
+        .splice_read    = bad_file_splice_read,
 };
 
+static int bad_inode_create (struct inode *dir, struct dentry *dentry,
+                int mode, struct nameidata *nd)
+{
+        return -EIO;
+}
+
+static struct dentry *bad_inode_lookup(struct inode *dir,
+                        struct dentry *dentry, struct nameidata *nd)
+{
+        return ERR_PTR(-EIO);
+}
+
+static int bad_inode_link (struct dentry *old_dentry, struct inode *dir,
+                struct dentry *dentry)
+{
+        return -EIO;
+}
+
+static int bad_inode_unlink(struct inode *dir, struct dentry *dentry)
+{
+        return -EIO;
+}
+
+static int bad_inode_symlink (struct inode *dir, struct dentry *dentry,
+                const char *symname)
+{
+        return -EIO;
+}
+
+static int bad_inode_mkdir(struct inode *dir, struct dentry *dentry,
+                        int mode)
+{
+        return -EIO;
+}
+
+static int bad_inode_rmdir (struct inode *dir, struct dentry *dentry)
+{
+        return -EIO;
+}
+
+static int bad_inode_mknod (struct inode *dir, struct dentry *dentry,
+                        int mode, dev_t rdev)
+{
+        return -EIO;
+}
+
+static int bad_inode_rename (struct inode *old_dir, struct dentry *old_dentry,
+                struct inode *new_dir, struct dentry *new_dentry)
+{
+        return -EIO;
+}
+
+static int bad_inode_readlink(struct dentry *dentry, char __user *buffer,
+                int buflen)
+{
+        return -EIO;
+}
+
+static int bad_inode_permission(struct inode *inode, int mask,
+                        struct nameidata *nd)
+{
+        return -EIO;
+}
+
+static int bad_inode_getattr(struct vfsmount *mnt, struct dentry *dentry,
+                        struct kstat *stat)
+{
+        return -EIO;
+}
+
+static int bad_inode_setattr(struct dentry *direntry, struct iattr *attrs)
+{
+        return -EIO;
+}
+
+static int bad_inode_setxattr(struct dentry *dentry, const char *name,
+                const void *value, size_t size, int flags)
+{
+        return -EIO;
+}
+
+static ssize_t bad_inode_getxattr(struct dentry *dentry, const char *name,
+                        void *buffer, size_t size)
+{
+        return -EIO;
+}
+
+static ssize_t bad_inode_listxattr(struct dentry *dentry, char *buffer,
+                        size_t buffer_size)
+{
+        return -EIO;
+}
+
+static int bad_inode_removexattr(struct dentry *dentry, const char *name)
+{
+        return -EIO;
+}
+
 static struct inode_operations bad_inode_ops =
 {
-        .create         = EIO_ERROR,
-        .lookup         = EIO_ERROR,
-        .link           = EIO_ERROR,
-        .unlink         = EIO_ERROR,
-        .symlink        = EIO_ERROR,
-        .mkdir          = EIO_ERROR,
-        .rmdir          = EIO_ERROR,
-        .mknod          = EIO_ERROR,
-        .rename         = EIO_ERROR,
-        .readlink       = EIO_ERROR,
+        .create         = bad_inode_create,
+        .lookup         = bad_inode_lookup,
+        .link           = bad_inode_link,
+        .unlink         = bad_inode_unlink,
+        .symlink        = bad_inode_symlink,
+        .mkdir          = bad_inode_mkdir,
+        .rmdir          = bad_inode_rmdir,
+        .mknod          = bad_inode_mknod,
+        .rename         = bad_inode_rename,
+        .readlink       = bad_inode_readlink,
         /* follow_link must be no-op, otherwise unmounting this inode
            won't work */
-        .truncate       = EIO_ERROR,
-        .permission     = EIO_ERROR,
-        .getattr        = EIO_ERROR,
-        .setattr        = EIO_ERROR,
-        .setxattr       = EIO_ERROR,
-        .getxattr       = EIO_ERROR,
-        .listxattr      = EIO_ERROR,
-        .removexattr    = EIO_ERROR,
+        /* put_link returns void */
+        /* truncate returns void */
+        .permission     = bad_inode_permission,
+        .getattr        = bad_inode_getattr,
+        .setattr        = bad_inode_setattr,
+        .setxattr       = bad_inode_setxattr,
+        .getxattr       = bad_inode_getxattr,
+        .listxattr      = bad_inode_listxattr,
+        .removexattr    = bad_inode_removexattr,
+        /* truncate_range returns void */
 };
 
 
@@ -88,7 +336,7 @@ static struct inode_operations bad_inode_ops =
  *      on it to fail from this point on.
  */
  
-void make_bad_inode(struct inode * inode) 
+void make_bad_inode(struct inode *inode)
 {
         remove_inode_hash(inode);
 
@@ -113,7 +361,7 @@ EXPORT_SYMBOL(make_bad_inode);
  *      Returns true if the inode in question has been marked as bad.
  */
  
-int is_bad_inode(struct inode * inode) 
+int is_bad_inode(struct inode *inode)
 {
         return (inode->i_op == &bad_inode_ops); 
 }
diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c
index b82381475779..2e0021e8f366 100644
--- a/fs/ufs/balloc.c
+++ b/fs/ufs/balloc.c
@@ -275,6 +275,25 @@ static void ufs_change_blocknr(struct inode *inode, unsigned int baseblk,
         UFSD("EXIT\n");
 }
 
+static void ufs_clear_frags(struct inode *inode, sector_t beg, unsigned int n,
+                            int sync)
+{
+        struct buffer_head *bh;
+        sector_t end = beg + n;
+
+        for (; beg < end; ++beg) {
+                bh = sb_getblk(inode->i_sb, beg);
+                lock_buffer(bh);
+                memset(bh->b_data, 0, inode->i_sb->s_blocksize);
+                set_buffer_uptodate(bh);
+                mark_buffer_dirty(bh);
+                unlock_buffer(bh);
+                if (IS_SYNC(inode) || sync)
+                        sync_dirty_buffer(bh);
+                brelse(bh);
+        }
+}
+
 unsigned ufs_new_fragments(struct inode * inode, __fs32 * p, unsigned fragment,
                            unsigned goal, unsigned count, int * err, struct page *locked_page)
 {
@@ -350,6 +369,8 @@ unsigned ufs_new_fragments(struct inode * inode, __fs32 * p, unsigned fragment,
                         *p = cpu_to_fs32(sb, result);
                         *err = 0;
                         UFS_I(inode)->i_lastfrag = max_t(u32, UFS_I(inode)->i_lastfrag, fragment + count);
+                        ufs_clear_frags(inode, result + oldcount, newcount - oldcount,
+                                        locked_page != NULL);
                 }
                 unlock_super(sb);
                 UFSD("EXIT, result %u\n", result);
@@ -363,6 +384,8 @@ unsigned ufs_new_fragments(struct inode * inode, __fs32 * p, unsigned fragment,
         if (result) {
                 *err = 0;
                 UFS_I(inode)->i_lastfrag = max_t(u32, UFS_I(inode)->i_lastfrag, fragment + count);
+                ufs_clear_frags(inode, result + oldcount, newcount - oldcount,
+                                locked_page != NULL);
                 unlock_super(sb);
                 UFSD("EXIT, result %u\n", result);
                 return result;
@@ -398,6 +421,8 @@ unsigned ufs_new_fragments(struct inode * inode, __fs32 * p, unsigned fragment,
                 *p = cpu_to_fs32(sb, result);
                 *err = 0;
                 UFS_I(inode)->i_lastfrag = max_t(u32, UFS_I(inode)->i_lastfrag, fragment + count);
+                ufs_clear_frags(inode, result + oldcount, newcount - oldcount,
+                                locked_page != NULL);
                 unlock_super(sb);
                 if (newcount < request)
                         ufs_free_fragments (inode, result + newcount, request - newcount);
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index ee1eaa6f4ec2..2fbab0aab688 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -156,36 +156,6 @@ out:
         return ret;
 }
 
-static void ufs_clear_frag(struct inode *inode, struct buffer_head *bh)
-{
-        lock_buffer(bh);
-        memset(bh->b_data, 0, inode->i_sb->s_blocksize);
-        set_buffer_uptodate(bh);
-        mark_buffer_dirty(bh);
-        unlock_buffer(bh);
-        if (IS_SYNC(inode))
-                sync_dirty_buffer(bh);
-}
-
-static struct buffer_head *
-ufs_clear_frags(struct inode *inode, sector_t beg,
-                unsigned int n, sector_t want)
-{
-        struct buffer_head *res = NULL, *bh;
-        sector_t end = beg + n;
-
-        for (; beg < end; ++beg) {
-                bh = sb_getblk(inode->i_sb, beg);
-                ufs_clear_frag(inode, bh);
-                if (want != beg)
-                        brelse(bh);
-                else
-                        res = bh;
-        }
-        BUG_ON(!res);
-        return res;
-}
-
 /**
  * ufs_inode_getfrag() - allocate new fragment(s)
  * @inode - pointer to inode
@@ -302,7 +272,7 @@ repeat:
         }
 
         if (!phys) {
-                result = ufs_clear_frags(inode, tmp, required, tmp + blockoff);
+                result = sb_getblk(sb, tmp + blockoff);
         } else {
                 *phys = tmp + blockoff;
                 result = NULL;
@@ -403,8 +373,7 @@ repeat:
 
 
         if (!phys) {
-                result = ufs_clear_frags(inode, tmp, uspi->s_fpb,
-                                         tmp + blockoff);
+                result = sb_getblk(sb, tmp + blockoff);
         } else {
                 *phys = tmp + blockoff;
                 *new = 1;
@@ -471,13 +440,13 @@ int ufs_getfrag_block(struct inode *inode, sector_t fragment, struct buffer_head
 #define GET_INODE_DATABLOCK(x) \
         ufs_inode_getfrag(inode, x, fragment, 1, &err, &phys, &new, bh_result->b_page)
 #define GET_INODE_PTR(x) \
-        ufs_inode_getfrag(inode, x, fragment, uspi->s_fpb, &err, NULL, NULL, bh_result->b_page)
+        ufs_inode_getfrag(inode, x, fragment, uspi->s_fpb, &err, NULL, NULL, NULL)
 #define GET_INDIRECT_DATABLOCK(x) \
         ufs_inode_getblock(inode, bh, x, fragment,      \
-                          &err, &phys, &new, bh_result->b_page);
+                          &err, &phys, &new, bh_result->b_page)
 #define GET_INDIRECT_PTR(x) \
         ufs_inode_getblock(inode, bh, x, fragment,      \
-                          &err, NULL, NULL, bh_result->b_page);
+                          &err, NULL, NULL, NULL)
 
         if (ptr < UFS_NDIR_FRAGMENT) {
                 bh = GET_INODE_DATABLOCK(ptr);