Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

[karo-tx-linux.git] / fs / ocfs2 / file.c

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index be2dd95d3a1dc0c916229ad4deb643ed0ee841b0..ed38796052d201f28da44d0ec60d7bf4baf078a8 100644 (file)
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -1766,8 +1766,8 @@ out_inode_unlock:
 out_rw_unlock:
        ocfs2_rw_unlock(inode, 1);
 
-       mutex_unlock(&inode->i_mutex);
 out:
+       mutex_unlock(&inode->i_mutex);
        return ret;
 }
 
@@ -2228,6 +2228,7 @@ const struct inode_operations ocfs2_file_iops = {
        .getattr        = ocfs2_getattr,
        .permission     = ocfs2_permission,
        .fallocate      = ocfs2_fallocate,
+       .fiemap         = ocfs2_fiemap,
 };
 
 const struct inode_operations ocfs2_special_file_iops = {