Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

Conflicts:

	arch/sparc64/kernel/pci_psycho.c

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/bfs/dir.c b/fs/bfs/dir.c
index 87ee5ccee348..ed8feb052df9 100644
--- a/fs/bfs/dir.c
+++ b/fs/bfs/dir.c
@@ -125,8 +125,8 @@ static int bfs_create(struct inode *dir, struct dentry *dentry, int mode,
                                                         inode->i_ino);
         if (err) {
                 inode_dec_link_count(inode);
-                iput(inode);
                 mutex_unlock(&info->bfs_lock);
+                iput(inode);
                 return err;
         }
         mutex_unlock(&info->bfs_lock);