ldiskfs/kernel_patches/patches/rhel6.3/ext4-add-more-error-checks-to-ext4_mkdir.patch

   1 From dabd991f9d8e3232bb4531c920daddac8d10d313 Mon Sep 17 00:00:00 2001
   2 From: Namhyung Kim <namhyung@gmail.com>
   3 Date: Mon, 10 Jan 2011 12:11:16 -0500
   4 Subject: ext4: add more error checks to ext4_mkdir()
   5 Git-commit: dabd991f
   6 Patch-mainline: v2.6.38-rc1
   7
   8 Check return value of ext4_journal_get_write_access,
   9 ext4_journal_dirty_metadata and ext4_mark_inode_dirty. Move brelse()
  10 under 'out_stop' to release bh properly in case of journal error.
  11
  12 Upstream-Signed-off-by: Namhyung Kim <namhyung@gmail.com>
  13 Upstream-Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
  14 Upstream-Acked-by: Jeff Mahoney <jeffm@suse.com>
  15 ---
  16  fs/ext4/namei.c |   21 ++++++++++++++-------
  17  1 files changed, 14 insertions(+), 7 deletions(-)
  18
  19 diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
  20 index 96a594d..6dfc5b9 100644
  21 --- a/fs/ext4/namei.c
  22 +++ b/fs/ext4/namei.c
  23 @@ -1789,7 +1789,7 @@ static int ext4_mkdir(struct inode *dir, struct dentry *dentry, int mode)
  24  {
  25         handle_t *handle;
  26         struct inode *inode;
  27 -       struct buffer_head *dir_block;
  28 +       struct buffer_head *dir_block = NULL;
  29         struct ext4_dir_entry_2 *de;
  30         unsigned int blocksize = dir->i_sb->s_blocksize;
  31         int err, retries = 0;
  32 @@ -1822,7 +1822,9 @@ retry:
  33         if (!dir_block)
  34                 goto out_clear_inode;
  35         BUFFER_TRACE(dir_block, "get_write_access");
  36 -       ext4_journal_get_write_access(handle, dir_block);
  37 +       err = ext4_journal_get_write_access(handle, dir_block);
  38 +       if (err)
  39 +               goto out_clear_inode;
  40         de = (struct ext4_dir_entry_2 *) dir_block->b_data;
  41         de->inode = cpu_to_le32(inode->i_ino);
  42         de->name_len = 1;
  43 @@ -1839,10 +1841,12 @@ retry:
  44         ext4_set_de_type(dir->i_sb, de, S_IFDIR);
  45         inode->i_nlink = 2;
  46         BUFFER_TRACE(dir_block, "call ext4_handle_dirty_metadata");
  47 -       ext4_handle_dirty_metadata(handle, inode, dir_block);
  48 -       brelse(dir_block);
  49 -       ext4_mark_inode_dirty(handle, inode);
  50 -       err = ext4_add_entry(handle, dentry, inode);
  51 +       err = ext4_handle_dirty_metadata(handle, inode, dir_block);
  52 +       if (err)
  53 +               goto out_clear_inode;
  54 +       err = ext4_mark_inode_dirty(handle, inode);
  55 +       if (!err)
  56 +               err = ext4_add_entry(handle, dentry, inode);
  57         if (err) {
  58  out_clear_inode:
  59                 clear_nlink(inode);
  60 @@ -1853,10 +1857,13 @@ out_clear_inode:
  61         }
  62         ext4_inc_count(handle, dir);
  63         ext4_update_dx_flag(dir);
  64 -       ext4_mark_inode_dirty(handle, dir);
  65 +       err = ext4_mark_inode_dirty(handle, dir);
  66 +       if (err)
  67 +               goto out_clear_inode;
  68         d_instantiate(dentry, inode);
  69         unlock_new_inode(inode);
  70  out_stop:
  71 +       brelse(dir_block);
  72         ext4_journal_stop(handle);
  73         if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries))
  74                 goto retry;
  75