X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fncp_fs_sb.h;h=cf858eb80f0ba430ec2e932014bd7786057295f0;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=b089d95062835dd769c5c19bfb88361dec94edbe;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git diff --git a/include/linux/ncp_fs_sb.h b/include/linux/ncp_fs_sb.h index b089d9506..cf858eb80 100644 --- a/include/linux/ncp_fs_sb.h +++ b/include/linux/ncp_fs_sb.h @@ -11,7 +11,6 @@ #include #include #include -#include #ifdef __KERNEL__ @@ -52,7 +51,7 @@ struct ncp_server { receive replies */ int lock; /* To prevent mismatch in protocols. */ - struct mutex mutex; + struct semaphore sem; int current_size; /* for packet preparation */ int has_subfunction; @@ -97,7 +96,7 @@ struct ncp_server { struct { struct work_struct tq; /* STREAM/DGRAM: data/error ready */ struct ncp_request_reply* creq; /* STREAM/DGRAM: awaiting reply from this request */ - struct mutex creq_mutex; /* DGRAM only: lock accesses to rcv.creq */ + struct semaphore creq_sem; /* DGRAM only: lock accesses to rcv.creq */ unsigned int state; /* STREAM only: receiver state */ struct {