10 files changed, 60 insertions, 107 deletions

diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c
index e5de9422fa3..45559dc3ea2 100644
--- a/fs/jfs/acl.c
+++ b/fs/jfs/acl.c
@@ -27,7 +27,7 @@
 #include "jfs_xattr.h"
 #include "jfs_acl.h"
 
-static struct posix_acl *jfs_get_acl(struct inode *inode, int type)
+struct posix_acl *jfs_get_acl(struct inode *inode, int type)
 {
         struct posix_acl *acl;
         char *ea_name;
@@ -114,30 +114,9 @@ out:
         return rc;
 }
 
-int jfs_check_acl(struct inode *inode, int mask, unsigned int flags)
-{
-        struct posix_acl *acl;
-
-        if (flags & IPERM_FLAG_RCU)
-                return -ECHILD;
-
-        acl = jfs_get_acl(inode, ACL_TYPE_ACCESS);
-        if (IS_ERR(acl))
-                return PTR_ERR(acl);
-        if (acl) {
-                int error = posix_acl_permission(inode, acl, mask);
-                posix_acl_release(acl);
-                return error;
-        }
-
-        return -EAGAIN;
-}
-
 int jfs_init_acl(tid_t tid, struct inode *inode, struct inode *dir)
 {
         struct posix_acl *acl = NULL;
-        struct posix_acl *clone;
-        mode_t mode;
         int rc = 0;
 
         if (S_ISLNK(inode->i_mode))
@@ -153,20 +132,11 @@ int jfs_init_acl(tid_t tid, struct inode *inode, struct inode *dir)
                         if (rc)
                                 goto cleanup;
                 }
-                clone = posix_acl_clone(acl, GFP_KERNEL);
-                if (!clone) {
-                        rc = -ENOMEM;
-                        goto cleanup;
-                }
-                mode = inode->i_mode;
-                rc = posix_acl_create_masq(clone, &mode);
-                if (rc >= 0) {
-                        inode->i_mode = mode;
-                        if (rc > 0)
-                                rc = jfs_set_acl(tid, inode, ACL_TYPE_ACCESS,
-                                                 clone);
-                }
-                posix_acl_release(clone);
+                rc = posix_acl_create(&acl, GFP_KERNEL, &inode->i_mode);
+                if (rc < 0)
+                        goto cleanup; /* posix_acl_release(NULL) is no-op */
+                if (rc > 0)
+                        rc = jfs_set_acl(tid, inode, ACL_TYPE_ACCESS, acl);
 cleanup:
                 posix_acl_release(acl);
         } else
@@ -180,8 +150,9 @@ cleanup:
 
 int jfs_acl_chmod(struct inode *inode)
 {
-        struct posix_acl *acl, *clone;
+        struct posix_acl *acl;
         int rc;
+        tid_t tid;
 
         if (S_ISLNK(inode->i_mode))
                 return -EOPNOTSUPP;
@@ -190,22 +161,18 @@ int jfs_acl_chmod(struct inode *inode)
         if (IS_ERR(acl) || !acl)
                 return PTR_ERR(acl);
 
-        clone = posix_acl_clone(acl, GFP_KERNEL);
-        posix_acl_release(acl);
-        if (!clone)
-                return -ENOMEM;
-
-        rc = posix_acl_chmod_masq(clone, inode->i_mode);
-        if (!rc) {
-                tid_t tid = txBegin(inode->i_sb, 0);
-                mutex_lock(&JFS_IP(inode)->commit_mutex);
-                rc = jfs_set_acl(tid, inode, ACL_TYPE_ACCESS, clone);
-                if (!rc)
-                        rc = txCommit(tid, 1, &inode, 0);
-                txEnd(tid);
-                mutex_unlock(&JFS_IP(inode)->commit_mutex);
-        }
+        rc = posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);
+        if (rc)
+                return rc;
 
-        posix_acl_release(clone);
+        tid = txBegin(inode->i_sb, 0);
+        mutex_lock(&JFS_IP(inode)->commit_mutex);
+        rc = jfs_set_acl(tid, inode, ACL_TYPE_ACCESS, acl);
+        if (!rc)
+                rc = txCommit(tid, 1, &inode, 0);
+        txEnd(tid);
+        mutex_unlock(&JFS_IP(inode)->commit_mutex);
+
+        posix_acl_release(acl);
         return rc;
 }
diff --git a/fs/jfs/file.c b/fs/jfs/file.c
index 2f3f531f360..844f9460cb1 100644
--- a/fs/jfs/file.c
+++ b/fs/jfs/file.c
@@ -28,19 +28,26 @@
 #include "jfs_acl.h"
 #include "jfs_debug.h"
 
-int jfs_fsync(struct file *file, int datasync)
+int jfs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 {
         struct inode *inode = file->f_mapping->host;
         int rc = 0;
 
+        rc = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        if (rc)
+                return rc;
+
+        mutex_lock(&inode->i_mutex);
         if (!(inode->i_state & I_DIRTY) ||
             (datasync && !(inode->i_state & I_DIRTY_DATASYNC))) {
                 /* Make sure committed changes hit the disk */
                 jfs_flush_journal(JFS_SBI(inode->i_sb)->log, 1);
+                mutex_unlock(&inode->i_mutex);
                 return rc;
         }
 
         rc |= jfs_commit_inode(inode, 1);
+        mutex_unlock(&inode->i_mutex);
 
         return rc ? -EIO : 0;
 }
@@ -110,6 +117,8 @@ int jfs_setattr(struct dentry *dentry, struct iattr *iattr)
 
         if ((iattr->ia_valid & ATTR_SIZE) &&
             iattr->ia_size != i_size_read(inode)) {
+                inode_dio_wait(inode);
+
                 rc = vmtruncate(inode, iattr->ia_size);
                 if (rc)
                         return rc;
@@ -131,7 +140,7 @@ const struct inode_operations jfs_file_inode_operations = {
         .removexattr    = jfs_removexattr,
         .setattr        = jfs_setattr,
 #ifdef CONFIG_JFS_POSIX_ACL
-        .check_acl      = jfs_check_acl,
+        .get_acl        = jfs_get_acl,
 #endif
 };
 
diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index 109655904bb..77b69b27f82 100644
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -329,8 +329,8 @@ static ssize_t jfs_direct_IO(int rw, struct kiocb *iocb,
         struct inode *inode = file->f_mapping->host;
         ssize_t ret;
 
-        ret = blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov,
-                                offset, nr_segs, jfs_get_block, NULL);
+        ret = blockdev_direct_IO(rw, iocb, inode, iov, offset, nr_segs,
+                                 jfs_get_block);
 
         /*
          * In case of error extending write may have instantiated a few
diff --git a/fs/jfs/jfs_acl.h b/fs/jfs/jfs_acl.h
index f9285c4900f..ad84fe50ca9 100644
--- a/fs/jfs/jfs_acl.h
+++ b/fs/jfs/jfs_acl.h
@@ -20,7 +20,7 @@
 
 #ifdef CONFIG_JFS_POSIX_ACL
 
-int jfs_check_acl(struct inode *, int, unsigned int flags);
+struct posix_acl *jfs_get_acl(struct inode *inode, int type);
 int jfs_init_acl(tid_t, struct inode *, struct inode *);
 int jfs_acl_chmod(struct inode *inode);
 
diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
index 4496872cf4e..9cbd11a3f80 100644
--- a/fs/jfs/jfs_dmap.c
+++ b/fs/jfs/jfs_dmap.c
@@ -3161,7 +3161,7 @@ static int dbAllocDmapBU(struct bmap * bmp, struct dmap * dp, s64 blkno,
 {
         int rc;
         int dbitno, word, rembits, nb, nwords, wbitno, agno;
-        s8 oldroot, *leaf;
+        s8 oldroot;
         struct dmaptree *tp = (struct dmaptree *) & dp->tree;
 
         /* save the current value of the root (i.e. maximum free string)
@@ -3169,9 +3169,6 @@ static int dbAllocDmapBU(struct bmap * bmp, struct dmap * dp, s64 blkno,
          */
         oldroot = tp->stree[ROOT];
 
-        /* pick up a pointer to the leaves of the dmap tree */
-        leaf = tp->stree + LEAFIND;
-
         /* determine the bit number and word within the dmap of the
          * starting block.
          */
diff --git a/fs/jfs/jfs_inode.h b/fs/jfs/jfs_inode.h
index ec2fb8b945f..9271cfe4a14 100644
--- a/fs/jfs/jfs_inode.h
+++ b/fs/jfs/jfs_inode.h
@@ -21,7 +21,7 @@
 struct fid;
 
 extern struct inode *ialloc(struct inode *, umode_t);
-extern int jfs_fsync(struct file *, int);
+extern int jfs_fsync(struct file *, loff_t, loff_t, int);
 extern long jfs_ioctl(struct file *, unsigned int, unsigned long);
 extern long jfs_compat_ioctl(struct file *, unsigned int, unsigned long);
 extern struct inode *jfs_iget(struct super_block *, unsigned long);
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index f6cc0c09ec6..af9606057dd 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -1143,7 +1143,6 @@ int txCommit(tid_t tid,		/* transaction identifier */
         struct jfs_log *log;
         struct tblock *tblk;
         struct lrd *lrd;
-        int lsn;
         struct inode *ip;
         struct jfs_inode_info *jfs_ip;
         int k, n;
@@ -1310,7 +1309,7 @@ int txCommit(tid_t tid,		/* transaction identifier */
          */
         lrd->type = cpu_to_le16(LOG_COMMIT);
         lrd->length = 0;
-        lsn = lmLog(log, tblk, lrd, NULL);
+        lmLog(log, tblk, lrd, NULL);
 
         lmGroupCommit(log, tblk);
 
@@ -2935,7 +2934,6 @@ int jfs_sync(void *arg)
 {
         struct inode *ip;
         struct jfs_inode_info *jfs_ip;
-        int rc;
         tid_t tid;
 
         do {
@@ -2961,7 +2959,7 @@ int jfs_sync(void *arg)
                                  */
                                 TXN_UNLOCK();
                                 tid = txBegin(ip->i_sb, COMMIT_INODE);
-                                rc = txCommit(tid, 1, &ip, 0);
+                                txCommit(tid, 1, &ip, 0);
                                 txEnd(tid);
                                 mutex_unlock(&jfs_ip->commit_mutex);
 
diff --git a/fs/jfs/jfs_umount.c b/fs/jfs/jfs_umount.c
index adcf92d3b60..7971f37534a 100644
--- a/fs/jfs/jfs_umount.c
+++ b/fs/jfs/jfs_umount.c
@@ -68,7 +68,7 @@ int jfs_umount(struct super_block *sb)
                 /*
                  * Wait for outstanding transactions to be written to log:
                  */
-                jfs_flush_journal(log, 1);
+                jfs_flush_journal(log, 2);
 
         /*
          * close fileset inode allocation map (aka fileset inode)
@@ -146,7 +146,7 @@ int jfs_umount_rw(struct super_block *sb)
          *
          * remove file system from log active file system list.
          */
-        jfs_flush_journal(log, 1);
+        jfs_flush_journal(log, 2);
 
         /*
          * Make sure all metadata makes it to disk
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index eaaf2b511e8..e17545e1566 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -893,7 +893,7 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
         unchar *i_fastsymlink;
         s64 xlen = 0;
         int bmask = 0, xsize;
-        s64 extent = 0, xaddr;
+        s64 xaddr;
         struct metapage *mp;
         struct super_block *sb;
         struct tblock *tblk;
@@ -993,7 +993,6 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
                         txAbort(tid, 0);
                         goto out3;
                 }
-                extent = xaddr;
                 ip->i_size = ssize - 1;
                 while (ssize) {
                         /* This is kind of silly since PATH_MAX == 4K */
@@ -1456,34 +1455,23 @@ static struct dentry *jfs_lookup(struct inode *dip, struct dentry *dentry, struc
         ino_t inum;
         struct inode *ip;
         struct component_name key;
-        const char *name = dentry->d_name.name;
-        int len = dentry->d_name.len;
         int rc;
 
-        jfs_info("jfs_lookup: name = %s", name);
-
-        if ((name[0] == '.') && (len == 1))
-                inum = dip->i_ino;
-        else if (strcmp(name, "..") == 0)
-                inum = PARENT(dip);
-        else {
-                if ((rc = get_UCSname(&key, dentry)))
-                        return ERR_PTR(rc);
-                rc = dtSearch(dip, &key, &inum, &btstack, JFS_LOOKUP);
-                free_UCSname(&key);
-                if (rc == -ENOENT) {
-                        d_add(dentry, NULL);
-                        return NULL;
-                } else if (rc) {
-                        jfs_err("jfs_lookup: dtSearch returned %d", rc);
-                        return ERR_PTR(rc);
-                }
-        }
-
-        ip = jfs_iget(dip->i_sb, inum);
-        if (IS_ERR(ip)) {
-                jfs_err("jfs_lookup: iget failed on inum %d", (uint) inum);
-                return ERR_CAST(ip);
+        jfs_info("jfs_lookup: name = %s", dentry->d_name.name);
+
+        if ((rc = get_UCSname(&key, dentry)))
+                return ERR_PTR(rc);
+        rc = dtSearch(dip, &key, &inum, &btstack, JFS_LOOKUP);
+        free_UCSname(&key);
+        if (rc == -ENOENT) {
+                ip = NULL;
+        } else if (rc) {
+                jfs_err("jfs_lookup: dtSearch returned %d", rc);
+                ip = ERR_PTR(rc);
+        } else {
+                ip = jfs_iget(dip->i_sb, inum);
+                if (IS_ERR(ip))
+                        jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum);
         }
 
         return d_splice_alias(ip, dentry);
@@ -1548,7 +1536,7 @@ const struct inode_operations jfs_dir_inode_operations = {
         .removexattr    = jfs_removexattr,
         .setattr        = jfs_setattr,
 #ifdef CONFIG_JFS_POSIX_ACL
-        .check_acl      = jfs_check_acl,
+        .get_acl        = jfs_get_acl,
 #endif
 };
 
@@ -1597,8 +1585,6 @@ out:
 
 static int jfs_ci_revalidate(struct dentry *dentry, struct nameidata *nd)
 {
-        if (nd && nd->flags & LOOKUP_RCU)
-                return -ECHILD;
         /*
          * This is not negative dentry. Always valid.
          *
@@ -1624,10 +1610,8 @@ static int jfs_ci_revalidate(struct dentry *dentry, struct nameidata *nd)
          * case sensitive name which is specified by user if this is
          * for creation.
          */
-        if (!(nd->flags & (LOOKUP_CONTINUE | LOOKUP_PARENT))) {
-                if (nd->flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET))
-                        return 0;
-        }
+        if (nd->flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET))
+                return 0;
         return 1;
 }
 
diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c
index 24838f1eeee..e87fedef23d 100644
--- a/fs/jfs/xattr.c
+++ b/fs/jfs/xattr.c
@@ -693,8 +693,7 @@ static int can_set_system_xattr(struct inode *inode, const char *name,
                         return rc;
                 }
                 if (acl) {
-                        mode_t mode = inode->i_mode;
-                        rc = posix_acl_equiv_mode(acl, &mode);
+                        rc = posix_acl_equiv_mode(acl, &inode->i_mode);
                         posix_acl_release(acl);
                         if (rc < 0) {
                                 printk(KERN_ERR
@@ -702,7 +701,6 @@ static int can_set_system_xattr(struct inode *inode, const char *name,
                                        rc);
                                 return rc;
                         }
-                        inode->i_mode = mode;
                         mark_inode_dirty(inode);
                 }
                 /*