---

yaml
---
r: 19327
b: refs/heads/master
c: dab6a42
h: refs/heads/master
i:
  19325: 35eb8c6
  19323: c1d6585
  19319: efb742b
  19311: b21e5ca
  19295: ccd7343
  19263: dcc4f77
  19199: bca27f5
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4fc4717fc55a3bcd3cfdafa285b7af164b83051
+refs/heads/master: dab6a42915554f70220e5a2ff55c59c749582c7b

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;
 }