vfs: pull ext4's double-i_mutex-locking into common code

[~andy/linux] / fs / ext4 / ioctl.c

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index a569d335f8049ac4b5c37e4446eedfd3028166e2..60589b60e9b04936cb2d27c9615b2b8caee246fb 100644 (file)
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -130,7 +130,7 @@ static long swap_inode_boot_loader(struct super_block *sb,
 
        /* Protect orig inodes against a truncate and make sure,
         * that only 1 swap_inode_boot_loader is running. */
-       ext4_inode_double_lock(inode, inode_bl);
+       lock_two_nondirectories(inode, inode_bl);
 
        truncate_inode_pages(&inode->i_data, 0);
        truncate_inode_pages(&inode_bl->i_data, 0);
@@ -205,7 +205,7 @@ static long swap_inode_boot_loader(struct super_block *sb,
        ext4_inode_resume_unlocked_dio(inode);
        ext4_inode_resume_unlocked_dio(inode_bl);
 
-       ext4_inode_double_unlock(inode, inode_bl);
+       unlock_two_nondirectories(inode, inode_bl);
 
        iput(inode_bl);