From: Matthew Wilcox <matthew@wil.cx>
Date: Thu, 6 Dec 2007 21:25:30 +0000 (-0500)
Subject: Remove commented-out code copied from NFS
X-Git-Tag: v2.6.25-rc1~1125^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dfe485a2c8afa54cb069fcf48476f6c90ea3fdf;p=linux-2.6

Remove commented-out code copied from NFS

This is a false positive when grepping ... change it to be what the NFS
code looks like now.

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
---

diff --git a/fs/smbfs/request.c b/fs/smbfs/request.c
index ca4b2d59c0..45f45933e8 100644
--- a/fs/smbfs/request.c
+++ b/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();