Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

ext3: Properly count journal credits for long symlinks

Browse source 
Commit ae54870a1d ("ext3: Fix lock inversion in ext3_symlink()")
recalculated the number of credits needed for a long symlink, in the
process of splitting it into two transactions.  However, the first
credit calculation under-counted because if selinux is enabled, credits
are needed to create the selinux xattr as well.

Overrunning the reservation will result in an OOPS in
journal_dirty_metadata() due to this assert:

  J_ASSERT_JH(jh, handle->h_buffer_credits > 0);

Fix this by increasing the reservation size.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Acked-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Eric Sandeen 2011-08-11 09:51:46 -05:00 committed by Linus Torvalds
parent 72fa59970f
commit d2db60df1e
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/ext3/namei.c
View file

@ -2209,9 +2209,11 @@ static int ext3_symlink (struct inode * dir,
/* /*
* For non-fast symlinks, we just allocate inode and put it on * For non-fast symlinks, we just allocate inode and put it on
* orphan list in the first transaction => we need bitmap, * orphan list in the first transaction => we need bitmap,
* group descriptor, sb, inode block, quota blocks. * group descriptor, sb, inode block, quota blocks, and
* possibly selinux xattr blocks.
*/ */
credits = 4 + EXT3_MAXQUOTAS_INIT_BLOCKS(dir->i_sb); credits = 4 + EXT3_MAXQUOTAS_INIT_BLOCKS(dir->i_sb) +
EXT3_XATTR_TRANS_BLOCKS;
} else { } else {
/* /*
* Fast symlink. We have to add entry to directory * Fast symlink. We have to add entry to directory