2 files changed, 6 insertions, 11 deletions

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index a651d528f80..a37aeba7dc1 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -1556,7 +1556,10 @@ static int copy_params(struct dm_ioctl __user *user, struct dm_ioctl **param)
 
         secure_data = tmp.flags & DM_SECURE_DATA_FLAG;
 
-        dmi = vmalloc(tmp.data_size);
+        /*
+         * Try to avoid low memory issues when a device is suspended.
+         */
+        dmi = __vmalloc(tmp.data_size, GFP_NOIO | __GFP_REPEAT | __GFP_HIGH, PAGE_KERNEL);
         if (!dmi) {
                 if (secure_data && clear_user(user, tmp.data_size))
                         return -EFAULT;
@@ -1657,18 +1660,10 @@ static int ctl_ioctl(uint command, struct dm_ioctl __user *user)
         }
 
         /*
-         * Trying to avoid low memory issues when a device is
-         * suspended.
-         */
-        current->flags |= PF_MEMALLOC;
-
-        /*
          * Copy the parameters into kernel space.
          */
         r = copy_params(user, &param);
 
-        current->flags &= ~PF_MEMALLOC;
-
         if (r)
                 return r;
 
diff --git a/include/uapi/linux/dm-ioctl.h b/include/uapi/linux/dm-ioctl.h
index 91e3a360f61..539b179b349 100644
--- a/include/uapi/linux/dm-ioctl.h
+++ b/include/uapi/linux/dm-ioctl.h
@@ -268,8 +268,8 @@ enum {
 
 #define DM_VERSION_MAJOR        4
 #define DM_VERSION_MINOR        23
-#define DM_VERSION_PATCHLEVEL   0
-#define DM_VERSION_EXTRA        "-ioctl (2012-07-25)"
+#define DM_VERSION_PATCHLEVEL   1
+#define DM_VERSION_EXTRA        "-ioctl (2012-12-18)"
 
 /* Status bits */
 #define DM_READONLY_FLAG        (1 << 0) /* In/Out */