Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[karo-tx-linux.git] / fs / reiserfs / ioctl.c

diff --git a/fs/reiserfs/ioctl.c b/fs/reiserfs/ioctl.c
index 15cb5fe6b425bce7fdd680511e28b0cf4fad3968..946ccbf5b5a10d9a104d48c4dcb66a6a8ec3ffc0 100644 (file)
--- a/fs/reiserfs/ioctl.c
+++ b/fs/reiserfs/ioctl.c
@@ -167,7 +167,6 @@ int reiserfs_commit_write(struct file *f, struct page *page,
 int reiserfs_unpack(struct inode *inode, struct file *filp)
 {
        int retval = 0;
-       int depth;
        int index;
        struct page *page;
        struct address_space *mapping;
@@ -183,11 +182,11 @@ int reiserfs_unpack(struct inode *inode, struct file *filp)
                return 0;
        }
 
-       depth = reiserfs_write_lock_once(inode->i_sb);
-
        /* we need to make sure nobody is changing the file size beneath us */
        reiserfs_mutex_lock_safe(&inode->i_mutex, inode->i_sb);
 
+       reiserfs_write_lock(inode->i_sb);
+
        write_from = inode->i_size & (blocksize - 1);
        /* if we are on a block boundary, we are already unpacked.  */
        if (write_from == 0) {
@@ -221,6 +220,6 @@ int reiserfs_unpack(struct inode *inode, struct file *filp)
 
       out:
        mutex_unlock(&inode->i_mutex);
-       reiserfs_write_unlock_once(inode->i_sb, depth);
+       reiserfs_write_unlock(inode->i_sb);
        return retval;
 }