diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2011-08-11 09:54:31 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-15 18:31:42 -0700 |
| commit | 8b180803c66ccc825d2969c1ea9929fcb7fba98e (patch) | |
| tree | 52643c3a17c557c5a1a8f5abc5baf473be241285 /fs/ext4 | |
| parent | 1ae2a2c0515870d784f1ea101b079bd0962b6cd5 (diff) | |
| download | kernel_samsung_tuna-8b180803c66ccc825d2969c1ea9929fcb7fba98e.zip kernel_samsung_tuna-8b180803c66ccc825d2969c1ea9929fcb7fba98e.tar.gz kernel_samsung_tuna-8b180803c66ccc825d2969c1ea9929fcb7fba98e.tar.bz2 | |
ext4: Properly count journal credits for long symlinks
commit 8c20871998c082f6fbc963f1449a5ba5140ee39a upstream.
Commit df5e6223407e ("ext4: fix deadlock in ext4_symlink() in ENOSPC
conditions") 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
jbd2_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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/namei.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index b754b77..458a394 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -2264,9 +2264,11 @@ static int ext4_symlink(struct inode *dir, /* * For non-fast symlinks, we just allocate inode and put it on * 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 + EXT4_MAXQUOTAS_INIT_BLOCKS(dir->i_sb); + credits = 4 + EXT4_MAXQUOTAS_INIT_BLOCKS(dir->i_sb) + + EXT4_XATTR_TRANS_BLOCKS; } else { /* * Fast symlink. We have to add entry to directory |