Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / fs / ext4 / ioctl.c

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index a567af161b06af1d10c3840bf1da0e8989848ac4..500567dd53b6fd9752096c014162927a730748f0 100644 (file)
--- 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,14 +241,13 @@ 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;
        }
 
-
        default:
                return -ENOTTY;
        }
@@ -257,7 +256,7 @@ flags_err:
 #ifdef CONFIG_COMPAT
 long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-       struct inode *inode = file->f_dentry->d_inode;
+       struct inode *inode = file->f_path.dentry->d_inode;
        int ret;
 
        /* These are just misnamed, they actually get/put from/to user an int */