Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  ext2/3/4: delete unneeded includes of module.h
  ext{3,4}: Fix potential race when setversion ioctl updates inode
  udf: Mark LVID buffer as uptodate before marking it dirty
  ext3: Don't warn from writepage when readonly inode is spotted after error
  jbd: Remove j_barrier mutex
  reiserfs: Force inode evictions before umount to avoid crash
  reiserfs: Fix quota mount option parsing
  udf: Treat symlink component of type 2 as /
  udf: Fix deadlock when converting file from in-ICB one to normal one
  udf: Cleanup calling convention of inode_getblk()
  ext2: Fix error handling on inode bitmap corruption
  ext3: Fix error handling on inode bitmap corruption
  ext3: replace ll_rw_block with other functions
  ext3: NULL dereference in ext3_evict_inode()
  jbd: clear revoked flag on buffers before a new transaction started
  ext3: call ext3_mark_recovery_complete() when recovery is really needed

8 files changed, 57 insertions, 27 deletions

diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c
index 92cc86dfa23d..1cde28438014 100644
--- a/fs/ext3/ialloc.c
+++ b/fs/ext3/ialloc.c
@@ -525,8 +525,12 @@ got:
         if (IS_DIRSYNC(inode))
                 handle->h_sync = 1;
         if (insert_inode_locked(inode) < 0) {
-                err = -EINVAL;
-                goto fail_drop;
+                /*
+                 * Likely a bitmap corruption causing inode to be allocated
+                 * twice.
+                 */
+                err = -EIO;
+                goto fail;
         }
         spin_lock(&sbi->s_next_gen_lock);
         inode->i_generation = sbi->s_next_generation++;
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 15cb47088aac..2d0afeca0b47 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -22,7 +22,6 @@
  *  Assorted race fixes, rewrite of ext3_get_block() by Al Viro, 2000
  */
 
-#include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/time.h>
 #include <linux/ext3_jbd.h>
@@ -223,8 +222,12 @@ void ext3_evict_inode (struct inode *inode)
          *
          * Note that directories do not have this problem because they don't
          * use page cache.
+         *
+         * The s_journal check handles the case when ext3_get_journal() fails
+         * and puts the journal inode.
          */
         if (inode->i_nlink && ext3_should_journal_data(inode) &&
+            EXT3_SB(inode->i_sb)->s_journal &&
             (S_ISLNK(inode->i_mode) || S_ISREG(inode->i_mode))) {
                 tid_t commit_tid = atomic_read(&ei->i_datasync_tid);
                 journal_t *journal = EXT3_SB(inode->i_sb)->s_journal;
@@ -1132,9 +1135,11 @@ struct buffer_head *ext3_bread(handle_t *handle, struct inode *inode,
         bh = ext3_getblk(handle, inode, block, create, err);
         if (!bh)
                 return bh;
-        if (buffer_uptodate(bh))
+        if (bh_uptodate_or_lock(bh))
                 return bh;
-        ll_rw_block(READ | REQ_META | REQ_PRIO, 1, &bh);
+        get_bh(bh);
+        bh->b_end_io = end_buffer_read_sync;
+        submit_bh(READ | REQ_META | REQ_PRIO, bh);
         wait_on_buffer(bh);
         if (buffer_uptodate(bh))
                 return bh;
@@ -1617,7 +1622,13 @@ static int ext3_ordered_writepage(struct page *page,
         int err;
 
         J_ASSERT(PageLocked(page));
-        WARN_ON_ONCE(IS_RDONLY(inode));
+        /*
+         * We don't want to warn for emergency remount. The condition is
+         * ordered to avoid dereferencing inode->i_sb in non-error case to
+         * avoid slow-downs.
+         */
+        WARN_ON_ONCE(IS_RDONLY(inode) &&
+                     !(EXT3_SB(inode->i_sb)->s_mount_state & EXT3_ERROR_FS));
 
         /*
          * We give up here if we're reentered, because it might be for a
@@ -1692,7 +1703,13 @@ static int ext3_writeback_writepage(struct page *page,
         int err;
 
         J_ASSERT(PageLocked(page));
-        WARN_ON_ONCE(IS_RDONLY(inode));
+        /*
+         * We don't want to warn for emergency remount. The condition is
+         * ordered to avoid dereferencing inode->i_sb in non-error case to
+         * avoid slow-downs.
+         */
+        WARN_ON_ONCE(IS_RDONLY(inode) &&
+                     !(EXT3_SB(inode->i_sb)->s_mount_state & EXT3_ERROR_FS));
 
         if (ext3_journal_current_handle())
                 goto out_fail;
@@ -1735,7 +1752,13 @@ static int ext3_journalled_writepage(struct page *page,
         int err;
 
         J_ASSERT(PageLocked(page));
-        WARN_ON_ONCE(IS_RDONLY(inode));
+        /*
+         * We don't want to warn for emergency remount. The condition is
+         * ordered to avoid dereferencing inode->i_sb in non-error case to
+         * avoid slow-downs.
+         */
+        WARN_ON_ONCE(IS_RDONLY(inode) &&
+                     !(EXT3_SB(inode->i_sb)->s_mount_state & EXT3_ERROR_FS));
 
         if (ext3_journal_current_handle())
                 goto no_write;
@@ -2064,12 +2087,10 @@ static int ext3_block_truncate_page(struct inode *inode, loff_t from)
         if (PageUptodate(page))
                 set_buffer_uptodate(bh);
 
-        if (!buffer_uptodate(bh)) {
-                err = -EIO;
-                ll_rw_block(READ, 1, &bh);
-                wait_on_buffer(bh);
+        if (!bh_uptodate_or_lock(bh)) {
+                err = bh_submit_read(bh);
                 /* Uhhuh. Read error. Complain and punt. */
-                if (!buffer_uptodate(bh))
+                if (err)
                         goto unlock;
         }
 
diff --git a/fs/ext3/ioctl.c b/fs/ext3/ioctl.c
index 8e37c41a071b..4af574ce4a46 100644
--- a/fs/ext3/ioctl.c
+++ b/fs/ext3/ioctl.c
@@ -134,10 +134,11 @@ flags_out:
                         goto setversion_out;
                 }
 
+                mutex_lock(&inode->i_mutex);
                 handle = ext3_journal_start(inode, 1);
                 if (IS_ERR(handle)) {
                         err = PTR_ERR(handle);
-                        goto setversion_out;
+                        goto unlock_out;
                 }
                 err = ext3_reserve_inode_write(handle, inode, &iloc);
                 if (err == 0) {
@@ -146,6 +147,9 @@ flags_out:
                         err = ext3_mark_iloc_dirty(handle, inode, &iloc);
                 }
                 ext3_journal_stop(handle);
+
+unlock_out:
+                mutex_unlock(&inode->i_mutex);
 setversion_out:
                 mnt_drop_write_file(filp);
                 return err;
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index d269821203fd..e8e211795e9f 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -921,9 +921,12 @@ restart:
                                 num++;
                                 bh = ext3_getblk(NULL, dir, b++, 0, &err);
                                 bh_use[ra_max] = bh;
-                                if (bh)
-                                        ll_rw_block(READ | REQ_META | REQ_PRIO,
-                                                    1, &bh);
+                                if (bh && !bh_uptodate_or_lock(bh)) {
+                                        get_bh(bh);
+                                        bh->b_end_io = end_buffer_read_sync;
+                                        submit_bh(READ | REQ_META | REQ_PRIO,
+                                                  bh);
+                                }
                         }
                 }
                 if ((bh = bh_use[ra_ptr++]) == NULL)
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 3a10b884e1be..726c7ef6cdf1 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -2059,9 +2059,10 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
         EXT3_SB(sb)->s_mount_state |= EXT3_ORPHAN_FS;
         ext3_orphan_cleanup(sb, es);
         EXT3_SB(sb)->s_mount_state &= ~EXT3_ORPHAN_FS;
-        if (needs_recovery)
+        if (needs_recovery) {
+                ext3_mark_recovery_complete(sb, es);
                 ext3_msg(sb, KERN_INFO, "recovery complete");
-        ext3_mark_recovery_complete(sb, es);
+        }
         ext3_msg(sb, KERN_INFO, "mounted filesystem with %s data mode",
                 test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_JOURNAL_DATA ? "journal":
                 test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA ? "ordered":
@@ -2229,11 +2230,11 @@ static journal_t *ext3_get_dev_journal(struct super_block *sb,
                 goto out_bdev;
         }
         journal->j_private = sb;
-        ll_rw_block(READ, 1, &journal->j_sb_buffer);
-        wait_on_buffer(journal->j_sb_buffer);
-        if (!buffer_uptodate(journal->j_sb_buffer)) {
-                ext3_msg(sb, KERN_ERR, "I/O error on journal device");
-                goto out_journal;
+        if (!bh_uptodate_or_lock(journal->j_sb_buffer)) {
+                if (bh_submit_read(journal->j_sb_buffer)) {
+                        ext3_msg(sb, KERN_ERR, "I/O error on journal device");
+                        goto out_journal;
+                }
         }
         if (be32_to_cpu(journal->j_superblock->s_nr_users) != 1) {
                 ext3_msg(sb, KERN_ERR,
diff --git a/fs/ext3/xattr_security.c b/fs/ext3/xattr_security.c
index 3c218b8a51d4..ea26f2acab94 100644
--- a/fs/ext3/xattr_security.c
+++ b/fs/ext3/xattr_security.c
@@ -3,7 +3,6 @@
  * Handler for storing security labels as extended attributes.
  */
 
-#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/fs.h>
diff --git a/fs/ext3/xattr_trusted.c b/fs/ext3/xattr_trusted.c
index dc8edda9ffe0..2526a8829de8 100644
--- a/fs/ext3/xattr_trusted.c
+++ b/fs/ext3/xattr_trusted.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2003 by Andreas Gruenbacher, <a.gruenbacher@computer.org>
  */
 
-#include <linux/module.h>
 #include <linux/string.h>
 #include <linux/capability.h>
 #include <linux/fs.h>
diff --git a/fs/ext3/xattr_user.c b/fs/ext3/xattr_user.c
index 7a321974d584..b32e473a1e33 100644
--- a/fs/ext3/xattr_user.c
+++ b/fs/ext3/xattr_user.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2001 by Andreas Gruenbacher, <a.gruenbacher@computer.org>
  */
 
-#include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fs.h>
 #include <linux/ext3_jbd.h>