Merge

diff --cc fs/reiserfs/namei.c
index 2ad25316df07a32e2f982fafce0ca8d454aef20f,40040a7bb801738dc2614dff81d49527db2323b2..48c337a87a6e4b825eb0c0eb848eb47cc5662efd
--- 1/fs/reiserfs/namei.c
--- 2/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@@ -358,9 -360,7 +360,10 @@@ static struct dentry * reiserfs_lookup 
            return ERR_PTR(-EACCES);
          }
      }
+     unlock_kernel();
 +    if ( retval == IO_ERROR ) {
 +      return ERR_PTR(-EIO);
 +    }
  
      d_add(dentry, inode);
      return NULL;