X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Focfs2%2Ffile.c;h=ec2ed15c3daab10894cf249d698a834924d74651;hb=1ef708ea449e5eab2780020ec79485db80937833;hp=e8514e8b6ce8977eb3f75d3a64a7b8f33f96726a;hpb=9b610fda0df5d0f0b0c64242e37441ad1b384aac;p=linux-2.6

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index e8514e8b6c..ec2ed15c3d 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -1176,7 +1176,7 @@ bail:
 	return err;
 }
 
-int ocfs2_permission(struct inode *inode, int mask, struct nameidata *nd)
+int ocfs2_permission(struct inode *inode, int mask)
 {
 	int ret;
 
@@ -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;
 }