Merge master.kernel.org:/home/rmk/linux-2.6-arm

[pandora-kernel.git] / fs / ncpfs / ncplib_kernel.c

diff --git a/fs/ncpfs/ncplib_kernel.c b/fs/ncpfs/ncplib_kernel.c
index c755e18..d9ebf64 100644 (file)
--- a/fs/ncpfs/ncplib_kernel.c
+++ b/fs/ncpfs/ncplib_kernel.c
@@ -291,7 +291,7 @@ ncp_make_closed(struct inode *inode)
        int err;
 
        err = 0;
-       down(&NCP_FINFO(inode)->open_sem);      
+       mutex_lock(&NCP_FINFO(inode)->open_mutex);
        if (atomic_read(&NCP_FINFO(inode)->opened) == 1) {
                atomic_set(&NCP_FINFO(inode)->opened, 0);
                err = ncp_close_file(NCP_SERVER(inode), NCP_FINFO(inode)->file_handle);
@@ -301,7 +301,7 @@ ncp_make_closed(struct inode *inode)
                                NCP_FINFO(inode)->volNumber,
                                NCP_FINFO(inode)->dirEntNum, err);
        }
-       up(&NCP_FINFO(inode)->open_sem);
+       mutex_unlock(&NCP_FINFO(inode)->open_mutex);
        return err;
 }