diff options
| author | Mingming Cao <cmm@us.ibm.com> | 2006-10-11 01:21:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 11:14:16 -0700 |
| commit | dab291af8d6307a3075c3d67d0cc8f98e646cb94 (patch) | |
| tree | a2207ab3e2e00472e5e3c969ad0dd211fb9e4151 /fs/ext4/ioctl.c | |
| parent | a920e9416b3469994860ab552dfd7fd5a5aff162 (diff) | |
| download | linux-stable-dab291af8d6307a3075c3d67d0cc8f98e646cb94.tar.gz linux-stable-dab291af8d6307a3075c3d67d0cc8f98e646cb94.tar.bz2 linux-stable-dab291af8d6307a3075c3d67d0cc8f98e646cb94.zip | |
[PATCH] jbd2: enable building of jbd2 and have ext4 use it rather than jbd
Reworked from a patch by Mingming Cao and Randy Dunlap
Signed-off-By: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/ext4/ioctl.c')
| -rw-r--r-- | fs/ext4/ioctl.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index a567af161b06..a63dce2117b8 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -8,10 +8,10 @@ */ #include <linux/fs.h> -#include <linux/jbd.h> +#include <linux/jbd2.h> #include <linux/capability.h> #include <linux/ext4_fs.h> -#include <linux/ext4_jbd.h> +#include <linux/ext4_jbd2.h> #include <linux/time.h> #include <linux/compat.h> #include <linux/smp_lock.h> @@ -219,9 +219,9 @@ flags_err: return -EFAULT; err = ext4_group_extend(sb, EXT4_SB(sb)->s_es, n_blocks_count); - journal_lock_updates(EXT4_SB(sb)->s_journal); - journal_flush(EXT4_SB(sb)->s_journal); - journal_unlock_updates(EXT4_SB(sb)->s_journal); + jbd2_journal_lock_updates(EXT4_SB(sb)->s_journal); + jbd2_journal_flush(EXT4_SB(sb)->s_journal); + jbd2_journal_unlock_updates(EXT4_SB(sb)->s_journal); return err; } @@ -241,9 +241,9 @@ flags_err: return -EFAULT; err = ext4_group_add(sb, &input); - journal_lock_updates(EXT4_SB(sb)->s_journal); - journal_flush(EXT4_SB(sb)->s_journal); - journal_unlock_updates(EXT4_SB(sb)->s_journal); + jbd2_journal_lock_updates(EXT4_SB(sb)->s_journal); + jbd2_journal_flush(EXT4_SB(sb)->s_journal); + jbd2_journal_unlock_updates(EXT4_SB(sb)->s_journal); return err; } |