From 9b36fd8c6a36527fcae49f841f01fabe52c0789c Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew@wil.cx>
Date: Thu, 6 Dec 2007 16:25:30 -0500
Subject: [PATCH] --- yaml --- r: 81774 b: refs/heads/master c:
 2dfe485a2c8afa54cb069fcf48476f6c90ea3fdf h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/smbfs/request.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2a1cde693b51..af704bf94d74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 150030b78a454ba50d5e267b0dcf01b162809192
+refs/heads/master: 2dfe485a2c8afa54cb069fcf48476f6c90ea3fdf
diff --git a/trunk/fs/smbfs/request.c b/trunk/fs/smbfs/request.c
index ca4b2d59c0ca..45f45933e862 100644
--- a/trunk/fs/smbfs/request.c
+++ b/trunk/fs/smbfs/request.c
@@ -105,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();