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

4 files changed, 52 insertions, 31 deletions

diff --git a/fs/udf/file.c b/fs/udf/file.c
index d8ffa7cc661d..dca0c3881e82 100644
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -125,7 +125,6 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
                         err = udf_expand_file_adinicb(inode);
                         if (err) {
                                 udf_debug("udf_expand_adinicb: err=%d\n", err);
-                                up_write(&iinfo->i_data_sem);
                                 return err;
                         }
                 } else {
@@ -133,9 +132,10 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
                                 iinfo->i_lenAlloc = pos + count;
                         else
                                 iinfo->i_lenAlloc = inode->i_size;
+                        up_write(&iinfo->i_data_sem);
                 }
-        }
-        up_write(&iinfo->i_data_sem);
+        } else
+                up_write(&iinfo->i_data_sem);
 
         retval = generic_file_aio_write(iocb, iov, nr_segs, ppos);
         if (retval > 0)
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 4598904be1bb..7699df7b3198 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -53,8 +53,7 @@ static int udf_update_inode(struct inode *, int);
 static void udf_fill_inode(struct inode *, struct buffer_head *);
 static int udf_sync_inode(struct inode *inode);
 static int udf_alloc_i_data(struct inode *inode, size_t size);
-static struct buffer_head *inode_getblk(struct inode *, sector_t, int *,
-                                        sector_t *, int *);
+static sector_t inode_getblk(struct inode *, sector_t, int *, int *);
 static int8_t udf_insert_aext(struct inode *, struct extent_position,
                               struct kernel_lb_addr, uint32_t);
 static void udf_split_extents(struct inode *, int *, int, int,
@@ -151,6 +150,12 @@ const struct address_space_operations udf_aops = {
         .bmap           = udf_bmap,
 };
 
+/*
+ * Expand file stored in ICB to a normal one-block-file
+ *
+ * This function requires i_data_sem for writing and releases it.
+ * This function requires i_mutex held
+ */
 int udf_expand_file_adinicb(struct inode *inode)
 {
         struct page *page;
@@ -169,9 +174,15 @@ int udf_expand_file_adinicb(struct inode *inode)
                         iinfo->i_alloc_type = ICBTAG_FLAG_AD_LONG;
                 /* from now on we have normal address_space methods */
                 inode->i_data.a_ops = &udf_aops;
+                up_write(&iinfo->i_data_sem);
                 mark_inode_dirty(inode);
                 return 0;
         }
+        /*
+         * Release i_data_sem so that we can lock a page - page lock ranks
+         * above i_data_sem. i_mutex still protects us against file changes.
+         */
+        up_write(&iinfo->i_data_sem);
 
         page = find_or_create_page(inode->i_mapping, 0, GFP_NOFS);
         if (!page)
@@ -187,6 +198,7 @@ int udf_expand_file_adinicb(struct inode *inode)
                 SetPageUptodate(page);
                 kunmap(page);
         }
+        down_write(&iinfo->i_data_sem);
         memset(iinfo->i_ext.i_data + iinfo->i_lenEAttr, 0x00,
                iinfo->i_lenAlloc);
         iinfo->i_lenAlloc = 0;
@@ -196,17 +208,20 @@ int udf_expand_file_adinicb(struct inode *inode)
                 iinfo->i_alloc_type = ICBTAG_FLAG_AD_LONG;
         /* from now on we have normal address_space methods */
         inode->i_data.a_ops = &udf_aops;
+        up_write(&iinfo->i_data_sem);
         err = inode->i_data.a_ops->writepage(page, &udf_wbc);
         if (err) {
                 /* Restore everything back so that we don't lose data... */
                 lock_page(page);
                 kaddr = kmap(page);
+                down_write(&iinfo->i_data_sem);
                 memcpy(iinfo->i_ext.i_data + iinfo->i_lenEAttr, kaddr,
                        inode->i_size);
                 kunmap(page);
                 unlock_page(page);
                 iinfo->i_alloc_type = ICBTAG_FLAG_AD_IN_ICB;
                 inode->i_data.a_ops = &udf_adinicb_aops;
+                up_write(&iinfo->i_data_sem);
         }
         page_cache_release(page);
         mark_inode_dirty(inode);
@@ -310,7 +325,6 @@ static int udf_get_block(struct inode *inode, sector_t block,
                          struct buffer_head *bh_result, int create)
 {
         int err, new;
-        struct buffer_head *bh;
         sector_t phys = 0;
         struct udf_inode_info *iinfo;
 
@@ -323,7 +337,6 @@ static int udf_get_block(struct inode *inode, sector_t block,
 
         err = -EIO;
         new = 0;
-        bh = NULL;
         iinfo = UDF_I(inode);
 
         down_write(&iinfo->i_data_sem);
@@ -332,13 +345,10 @@ static int udf_get_block(struct inode *inode, sector_t block,
                 iinfo->i_next_alloc_goal++;
         }
 
-        err = 0;
 
-        bh = inode_getblk(inode, block, &err, &phys, &new);
-        BUG_ON(bh);
-        if (err)
+        phys = inode_getblk(inode, block, &err, &new);
+        if (!phys)
                 goto abort;
-        BUG_ON(!phys);
 
         if (new)
                 set_buffer_new(bh_result);
@@ -547,11 +557,10 @@ out:
         return err;
 }
 
-static struct buffer_head *inode_getblk(struct inode *inode, sector_t block,
-                                        int *err, sector_t *phys, int *new)
+static sector_t inode_getblk(struct inode *inode, sector_t block,
+                             int *err, int *new)
 {
         static sector_t last_block;
-        struct buffer_head *result = NULL;
         struct kernel_long_ad laarr[EXTENT_MERGE_SIZE];
         struct extent_position prev_epos, cur_epos, next_epos;
         int count = 0, startnum = 0, endnum = 0;
@@ -566,6 +575,8 @@ static struct buffer_head *inode_getblk(struct inode *inode, sector_t block,
         int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
         int lastblock = 0;
 
+        *err = 0;
+        *new = 0;
         prev_epos.offset = udf_file_entry_alloc_offset(inode);
         prev_epos.block = iinfo->i_location;
         prev_epos.bh = NULL;
@@ -635,8 +646,7 @@ static struct buffer_head *inode_getblk(struct inode *inode, sector_t block,
                 brelse(cur_epos.bh);
                 brelse(next_epos.bh);
                 newblock = udf_get_lb_pblock(inode->i_sb, &eloc, offset);
-                *phys = newblock;
-                return NULL;
+                return newblock;
         }
 
         last_block = block;
@@ -664,7 +674,7 @@ static struct buffer_head *inode_getblk(struct inode *inode, sector_t block,
                         brelse(cur_epos.bh);
                         brelse(next_epos.bh);
                         *err = ret;
-                        return NULL;
+                        return 0;
                 }
                 c = 0;
                 offset = 0;
@@ -729,7 +739,7 @@ static struct buffer_head *inode_getblk(struct inode *inode, sector_t block,
                 if (!newblocknum) {
                         brelse(prev_epos.bh);
                         *err = -ENOSPC;
-                        return NULL;
+                        return 0;
                 }
                 iinfo->i_lenExtents += inode->i_sb->s_blocksize;
         }
@@ -761,10 +771,10 @@ static struct buffer_head *inode_getblk(struct inode *inode, sector_t block,
 
         newblock = udf_get_pblock(inode->i_sb, newblocknum,
                                 iinfo->i_location.partitionReferenceNum, 0);
-        if (!newblock)
-                return NULL;
-        *phys = newblock;
-        *err = 0;
+        if (!newblock) {
+                *err = -EIO;
+                return 0;
+        }
         *new = 1;
         iinfo->i_next_alloc_block = block;
         iinfo->i_next_alloc_goal = newblocknum;
@@ -775,7 +785,7 @@ static struct buffer_head *inode_getblk(struct inode *inode, sector_t block,
         else
                 mark_inode_dirty(inode);
 
-        return result;
+        return newblock;
 }
 
 static void udf_split_extents(struct inode *inode, int *c, int offset,
@@ -1111,10 +1121,9 @@ int udf_setsize(struct inode *inode, loff_t newsize)
                         if (bsize <
                             (udf_file_entry_alloc_offset(inode) + newsize)) {
                                 err = udf_expand_file_adinicb(inode);
-                                if (err) {
-                                        up_write(&iinfo->i_data_sem);
+                                if (err)
                                         return err;
-                                }
+                                down_write(&iinfo->i_data_sem);
                         } else
                                 iinfo->i_lenAlloc = newsize;
                 }
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 0c33225647a0..c09a84daaf50 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1798,6 +1798,12 @@ static void udf_close_lvid(struct super_block *sb)
                                 le16_to_cpu(lvid->descTag.descCRCLength)));
 
         lvid->descTag.tagChecksum = udf_tag_checksum(&lvid->descTag);
+        /*
+         * We set buffer uptodate unconditionally here to avoid spurious
+         * warnings from mark_buffer_dirty() when previous EIO has marked
+         * the buffer as !uptodate
+         */
+        set_buffer_uptodate(bh);
         mark_buffer_dirty(bh);
         sbi->s_lvid_dirty = 0;
         mutex_unlock(&sbi->s_alloc_mutex);
diff --git a/fs/udf/symlink.c b/fs/udf/symlink.c
index b1d4488b0f14..d7c6dbe4194b 100644
--- a/fs/udf/symlink.c
+++ b/fs/udf/symlink.c
@@ -41,10 +41,16 @@ static void udf_pc_to_char(struct super_block *sb, unsigned char *from,
                 pc = (struct pathComponent *)(from + elen);
                 switch (pc->componentType) {
                 case 1:
-                        if (pc->lengthComponentIdent == 0) {
-                                p = to;
-                                *p++ = '/';
-                        }
+                        /*
+                         * Symlink points to some place which should be agreed
+                         * upon between originator and receiver of the media. Ignore.
+                         */
+                        if (pc->lengthComponentIdent > 0)
+                                break;
+                        /* Fall through */
+                case 2:
+                        p = to;
+                        *p++ = '/';
                         break;
                 case 3:
                         memcpy(p, "../", 3);