Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6-omap-h63xx.git] / fs / ncpfs / file.c

diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c
index 973b444d691427cd05fc1e4ed8105606e04e1143..df37524b85db0a69f823935bdf666cda214f48e8 100644 (file)
--- a/fs/ncpfs/file.c
+++ b/fs/ncpfs/file.c
@@ -46,7 +46,7 @@ int ncp_make_open(struct inode *inode, int right)
                NCP_FINFO(inode)->volNumber, 
                NCP_FINFO(inode)->dirEntNum);
        error = -EACCES;
-       down(&NCP_FINFO(inode)->open_sem);
+       mutex_lock(&NCP_FINFO(inode)->open_mutex);
        if (!atomic_read(&NCP_FINFO(inode)->opened)) {
                struct ncp_entry_info finfo;
                int result;
@@ -93,7 +93,7 @@ int ncp_make_open(struct inode *inode, int right)
        }
 
 out_unlock:
-       up(&NCP_FINFO(inode)->open_sem);
+       mutex_unlock(&NCP_FINFO(inode)->open_mutex);
 out:
        return error;
 }
@@ -283,12 +283,15 @@ static int ncp_release(struct inode *inode, struct file *file) {
        return 0;
 }
 
-struct file_operations ncp_file_operations =
+const struct file_operations ncp_file_operations =
 {
        .llseek         = remote_llseek,
        .read           = ncp_file_read,
        .write          = ncp_file_write,
        .ioctl          = ncp_ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl   = ncp_compat_ioctl,
+#endif
        .mmap           = ncp_mmap,
        .release        = ncp_release,
        .fsync          = ncp_fsync,