diff options
Diffstat (limited to 'kernel/power/user.c')
| -rw-r--r-- | kernel/power/user.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/kernel/power/user.c b/kernel/power/user.c index bf0014d6a5f0..4d2289626a84 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c | |||
| @@ -195,6 +195,15 @@ static ssize_t snapshot_write(struct file *filp, const char __user *buf, | |||
| 195 | return res; | 195 | return res; |
| 196 | } | 196 | } |
| 197 | 197 | ||
| 198 | static void snapshot_deprecated_ioctl(unsigned int cmd) | ||
| 199 | { | ||
| 200 | if (printk_ratelimit()) | ||
| 201 | printk(KERN_NOTICE "%pf: ioctl '%.8x' is deprecated and will " | ||
| 202 | "be removed soon, update your suspend-to-disk " | ||
| 203 | "utilities\n", | ||
| 204 | __builtin_return_address(0), cmd); | ||
| 205 | } | ||
| 206 | |||
| 198 | static long snapshot_ioctl(struct file *filp, unsigned int cmd, | 207 | static long snapshot_ioctl(struct file *filp, unsigned int cmd, |
| 199 | unsigned long arg) | 208 | unsigned long arg) |
| 200 | { | 209 | { |
| @@ -246,8 +255,9 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, | |||
| 246 | data->frozen = 0; | 255 | data->frozen = 0; |
| 247 | break; | 256 | break; |
| 248 | 257 | ||
| 249 | case SNAPSHOT_CREATE_IMAGE: | ||
| 250 | case SNAPSHOT_ATOMIC_SNAPSHOT: | 258 | case SNAPSHOT_ATOMIC_SNAPSHOT: |
| 259 | snapshot_deprecated_ioctl(cmd); | ||
| 260 | case SNAPSHOT_CREATE_IMAGE: | ||
| 251 | if (data->mode != O_RDONLY || !data->frozen || data->ready) { | 261 | if (data->mode != O_RDONLY || !data->frozen || data->ready) { |
| 252 | error = -EPERM; | 262 | error = -EPERM; |
| 253 | break; | 263 | break; |
| @@ -275,8 +285,9 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, | |||
| 275 | data->ready = 0; | 285 | data->ready = 0; |
| 276 | break; | 286 | break; |
| 277 | 287 | ||
| 278 | case SNAPSHOT_PREF_IMAGE_SIZE: | ||
| 279 | case SNAPSHOT_SET_IMAGE_SIZE: | 288 | case SNAPSHOT_SET_IMAGE_SIZE: |
| 289 | snapshot_deprecated_ioctl(cmd); | ||
| 290 | case SNAPSHOT_PREF_IMAGE_SIZE: | ||
| 280 | image_size = arg; | 291 | image_size = arg; |
| 281 | break; | 292 | break; |
| 282 | 293 | ||
| @@ -290,15 +301,17 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, | |||
| 290 | error = put_user(size, (loff_t __user *)arg); | 301 | error = put_user(size, (loff_t __user *)arg); |
| 291 | break; | 302 | break; |
| 292 | 303 | ||
| 293 | case SNAPSHOT_AVAIL_SWAP_SIZE: | ||
| 294 | case SNAPSHOT_AVAIL_SWAP: | 304 | case SNAPSHOT_AVAIL_SWAP: |
| 305 | snapshot_deprecated_ioctl(cmd); | ||
| 306 | case SNAPSHOT_AVAIL_SWAP_SIZE: | ||
| 295 | size = count_swap_pages(data->swap, 1); | 307 | size = count_swap_pages(data->swap, 1); |
| 296 | size <<= PAGE_SHIFT; | 308 | size <<= PAGE_SHIFT; |
| 297 | error = put_user(size, (loff_t __user *)arg); | 309 | error = put_user(size, (loff_t __user *)arg); |
| 298 | break; | 310 | break; |
| 299 | 311 | ||
| 300 | case SNAPSHOT_ALLOC_SWAP_PAGE: | ||
| 301 | case SNAPSHOT_GET_SWAP_PAGE: | 312 | case SNAPSHOT_GET_SWAP_PAGE: |
| 313 | snapshot_deprecated_ioctl(cmd); | ||
| 314 | case SNAPSHOT_ALLOC_SWAP_PAGE: | ||
| 302 | if (data->swap < 0 || data->swap >= MAX_SWAPFILES) { | 315 | if (data->swap < 0 || data->swap >= MAX_SWAPFILES) { |
| 303 | error = -ENODEV; | 316 | error = -ENODEV; |
| 304 | break; | 317 | break; |
| @@ -321,6 +334,7 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, | |||
| 321 | break; | 334 | break; |
| 322 | 335 | ||
| 323 | case SNAPSHOT_SET_SWAP_FILE: /* This ioctl is deprecated */ | 336 | case SNAPSHOT_SET_SWAP_FILE: /* This ioctl is deprecated */ |
| 337 | snapshot_deprecated_ioctl(cmd); | ||
| 324 | if (!swsusp_swap_in_use()) { | 338 | if (!swsusp_swap_in_use()) { |
| 325 | /* | 339 | /* |
| 326 | * User space encodes device types as two-byte values, | 340 | * User space encodes device types as two-byte values, |
| @@ -362,6 +376,7 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, | |||
| 362 | break; | 376 | break; |
| 363 | 377 | ||
| 364 | case SNAPSHOT_PMOPS: /* This ioctl is deprecated */ | 378 | case SNAPSHOT_PMOPS: /* This ioctl is deprecated */ |
| 379 | snapshot_deprecated_ioctl(cmd); | ||
| 365 | error = -EINVAL; | 380 | error = -EINVAL; |
| 366 | 381 | ||
| 367 | switch (arg) { | 382 | switch (arg) { |
