From c0045610c8f820f73f739975e3b0864827cb5897 Mon Sep 17 00:00:00 2001
From: Alasdair G Kergon <agk@redhat.com>
Date: Wed, 1 Feb 2006 03:04:52 -0800
Subject: [PATCH] --- yaml --- r: 19327 b: refs/heads/master c:
 dab6a42915554f70220e5a2ff55c59c749582c7b h: refs/heads/master i:   19325:
 35eb8c635db726772adee86a8d0fdc5892424fae   19323:
 c1d658503ee3b8c22d42e4ba7a6b428e2c0a574c   19319:
 efb742bd99168dd6309052cc240b57b0954bb79a   19311:
 b21e5ca7d21a9c837388fb94a7333b0e18895d36   19295:
 ccd73438ce1ce8e6140ce9123a1c91df1fc4e015   19263:
 dcc4f77bdb7858aff2f01078364917dab735fda6   19199:
 bca27f50a4c6c5599eccbdda9be4f628e7b1f858 v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/md/dm-ioctl.c | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index dba5fa125578..a12e148fa3dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4fc4717fc55a3bcd3cfdafa285b7af164b83051
+refs/heads/master: dab6a42915554f70220e5a2ff55c59c749582c7b
diff --git a/trunk/drivers/md/dm-ioctl.c b/trunk/drivers/md/dm-ioctl.c
index 1235135b384b..442e2be6052e 100644
--- a/trunk/drivers/md/dm-ioctl.c
+++ b/trunk/drivers/md/dm-ioctl.c
@@ -1359,16 +1359,11 @@ static int ctl_ioctl(struct inode *inode, struct file *file,
 	 * Copy the parameters into kernel space.
 	 */
 	r = copy_params(user, &param);
-	if (r) {
-		current->flags &= ~PF_MEMALLOC;
-		return r;
-	}
 
-	/*
-	 * FIXME: eventually we will remove the PF_MEMALLOC flag
-	 * here.  However the tools still do nasty things like
-	 * 'load' while a device is suspended.
-	 */
+	current->flags &= ~PF_MEMALLOC;
+
+	if (r)
+		return r;
 
 	r = validate_params(cmd, param);
 	if (r)
@@ -1386,7 +1381,6 @@ static int ctl_ioctl(struct inode *inode, struct file *file,
 
  out:
 	free_params(param);
-	current->flags &= ~PF_MEMALLOC;
 	return r;
 }