Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[sfrench/cifs-2.6.git] / fs / ext3 / ioctl.c

diff --git a/fs/ext3/ioctl.c b/fs/ext3/ioctl.c
index 556cd5510078a5e83e3c9490ae4439fb41605c06..aaf1da17b6d49e588b4f22d3e16fabc86bafb037 100644 (file)
--- a/fs/ext3/ioctl.c
+++ b/fs/ext3/ioctl.c
@@ -182,7 +182,7 @@ flags_err:
                 * need to allocate reservation structure for this inode
                 * before set the window size
                 */
-               down(&ei->truncate_sem);
+               mutex_lock(&ei->truncate_mutex);
                if (!ei->i_block_alloc_info)
                        ext3_init_block_alloc_info(inode);
 
@@ -190,7 +190,7 @@ flags_err:
                        struct ext3_reserve_window_node *rsv = &ei->i_block_alloc_info->rsv_window_node;
                        rsv->rsv_goal_size = rsv_window_size;
                }
-               up(&ei->truncate_sem);
+               mutex_unlock(&ei->truncate_mutex);
                return 0;
        }
        case EXT3_IOC_GROUP_EXTEND: {