X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=fs%2Fsmbfs%2Frequest.c;h=45f45933e86279126f1f349b2381563c102d0559;hb=a058a632747dd0f1799b12f4ecd54e43f5b5f10d;hp=c288fbe7953d982e1980fc8dd6db9b7815044030;hpb=5c34202b8bf942da411b6599668a76b07449bbfd;p=mv-sheeva.git diff --git a/fs/smbfs/request.c b/fs/smbfs/request.c index c288fbe7953..45f45933e86 100644 --- a/fs/smbfs/request.c +++ b/fs/smbfs/request.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -39,7 +40,7 @@ int smb_init_request_cache(void) req_cachep = kmem_cache_create("smb_request", sizeof(struct smb_request), 0, SMB_SLAB_DEBUG | SLAB_HWCACHE_ALIGN, - NULL, NULL); + NULL); if (req_cachep == NULL) return -ENOMEM; @@ -104,7 +105,7 @@ struct smb_request *smb_alloc_request(struct smb_sb_info *server, int bufsize) if (nfs_try_to_free_pages(server)) continue; - if (signalled() && (server->flags & NFS_MOUNT_INTR)) + if (fatal_signal_pending(current)) return ERR_PTR(-ERESTARTSYS); current->policy = SCHED_YIELD; schedule();