diff options
author | Christoph Hellwig <hch@infradead.org> | 2010-02-16 03:44:55 -0500 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2010-03-04 18:20:25 -0500 |
commit | 5582c76f901d240f57329212b59b4d957ea8d6cf (patch) | |
tree | 3709746be14e89eebbd4099b59dff2aefc348167 /fs/quota/quota.c | |
parent | 799a9d44023c069f46bc5933a930eab0bd37d0df (diff) |
quota: split out compat_sys_quotactl support from quota.c
Instead of adding ifdefs just split it into a new file.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/quota/quota.c')
-rw-r--r-- | fs/quota/quota.c | 117 |
1 files changed, 0 insertions, 117 deletions
diff --git a/fs/quota/quota.c b/fs/quota/quota.c index 4506c6596347..95388f9b7356 100644 --- a/fs/quota/quota.c +++ b/fs/quota/quota.c | |||
@@ -10,7 +10,6 @@ | |||
10 | #include <linux/slab.h> | 10 | #include <linux/slab.h> |
11 | #include <asm/current.h> | 11 | #include <asm/current.h> |
12 | #include <asm/uaccess.h> | 12 | #include <asm/uaccess.h> |
13 | #include <linux/compat.h> | ||
14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
15 | #include <linux/security.h> | 14 | #include <linux/security.h> |
16 | #include <linux/syscalls.h> | 15 | #include <linux/syscalls.h> |
@@ -340,119 +339,3 @@ SYSCALL_DEFINE4(quotactl, unsigned int, cmd, const char __user *, special, | |||
340 | drop_super(sb); | 339 | drop_super(sb); |
341 | return ret; | 340 | return ret; |
342 | } | 341 | } |
343 | |||
344 | #if defined(CONFIG_COMPAT_FOR_U64_ALIGNMENT) | ||
345 | /* | ||
346 | * This code works only for 32 bit quota tools over 64 bit OS (x86_64, ia64) | ||
347 | * and is necessary due to alignment problems. | ||
348 | */ | ||
349 | struct compat_if_dqblk { | ||
350 | compat_u64 dqb_bhardlimit; | ||
351 | compat_u64 dqb_bsoftlimit; | ||
352 | compat_u64 dqb_curspace; | ||
353 | compat_u64 dqb_ihardlimit; | ||
354 | compat_u64 dqb_isoftlimit; | ||
355 | compat_u64 dqb_curinodes; | ||
356 | compat_u64 dqb_btime; | ||
357 | compat_u64 dqb_itime; | ||
358 | compat_uint_t dqb_valid; | ||
359 | }; | ||
360 | |||
361 | /* XFS structures */ | ||
362 | struct compat_fs_qfilestat { | ||
363 | compat_u64 dqb_bhardlimit; | ||
364 | compat_u64 qfs_nblks; | ||
365 | compat_uint_t qfs_nextents; | ||
366 | }; | ||
367 | |||
368 | struct compat_fs_quota_stat { | ||
369 | __s8 qs_version; | ||
370 | __u16 qs_flags; | ||
371 | __s8 qs_pad; | ||
372 | struct compat_fs_qfilestat qs_uquota; | ||
373 | struct compat_fs_qfilestat qs_gquota; | ||
374 | compat_uint_t qs_incoredqs; | ||
375 | compat_int_t qs_btimelimit; | ||
376 | compat_int_t qs_itimelimit; | ||
377 | compat_int_t qs_rtbtimelimit; | ||
378 | __u16 qs_bwarnlimit; | ||
379 | __u16 qs_iwarnlimit; | ||
380 | }; | ||
381 | |||
382 | asmlinkage long sys32_quotactl(unsigned int cmd, const char __user *special, | ||
383 | qid_t id, void __user *addr) | ||
384 | { | ||
385 | unsigned int cmds; | ||
386 | struct if_dqblk __user *dqblk; | ||
387 | struct compat_if_dqblk __user *compat_dqblk; | ||
388 | struct fs_quota_stat __user *fsqstat; | ||
389 | struct compat_fs_quota_stat __user *compat_fsqstat; | ||
390 | compat_uint_t data; | ||
391 | u16 xdata; | ||
392 | long ret; | ||
393 | |||
394 | cmds = cmd >> SUBCMDSHIFT; | ||
395 | |||
396 | switch (cmds) { | ||
397 | case Q_GETQUOTA: | ||
398 | dqblk = compat_alloc_user_space(sizeof(struct if_dqblk)); | ||
399 | compat_dqblk = addr; | ||
400 | ret = sys_quotactl(cmd, special, id, dqblk); | ||
401 | if (ret) | ||
402 | break; | ||
403 | if (copy_in_user(compat_dqblk, dqblk, sizeof(*compat_dqblk)) || | ||
404 | get_user(data, &dqblk->dqb_valid) || | ||
405 | put_user(data, &compat_dqblk->dqb_valid)) | ||
406 | ret = -EFAULT; | ||
407 | break; | ||
408 | case Q_SETQUOTA: | ||
409 | dqblk = compat_alloc_user_space(sizeof(struct if_dqblk)); | ||
410 | compat_dqblk = addr; | ||
411 | ret = -EFAULT; | ||
412 | if (copy_in_user(dqblk, compat_dqblk, sizeof(*compat_dqblk)) || | ||
413 | get_user(data, &compat_dqblk->dqb_valid) || | ||
414 | put_user(data, &dqblk->dqb_valid)) | ||
415 | break; | ||
416 | ret = sys_quotactl(cmd, special, id, dqblk); | ||
417 | break; | ||
418 | case Q_XGETQSTAT: | ||
419 | fsqstat = compat_alloc_user_space(sizeof(struct fs_quota_stat)); | ||
420 | compat_fsqstat = addr; | ||
421 | ret = sys_quotactl(cmd, special, id, fsqstat); | ||
422 | if (ret) | ||
423 | break; | ||
424 | ret = -EFAULT; | ||
425 | /* Copying qs_version, qs_flags, qs_pad */ | ||
426 | if (copy_in_user(compat_fsqstat, fsqstat, | ||
427 | offsetof(struct compat_fs_quota_stat, qs_uquota))) | ||
428 | break; | ||
429 | /* Copying qs_uquota */ | ||
430 | if (copy_in_user(&compat_fsqstat->qs_uquota, | ||
431 | &fsqstat->qs_uquota, | ||
432 | sizeof(compat_fsqstat->qs_uquota)) || | ||
433 | get_user(data, &fsqstat->qs_uquota.qfs_nextents) || | ||
434 | put_user(data, &compat_fsqstat->qs_uquota.qfs_nextents)) | ||
435 | break; | ||
436 | /* Copying qs_gquota */ | ||
437 | if (copy_in_user(&compat_fsqstat->qs_gquota, | ||
438 | &fsqstat->qs_gquota, | ||
439 | sizeof(compat_fsqstat->qs_gquota)) || | ||
440 | get_user(data, &fsqstat->qs_gquota.qfs_nextents) || | ||
441 | put_user(data, &compat_fsqstat->qs_gquota.qfs_nextents)) | ||
442 | break; | ||
443 | /* Copying the rest */ | ||
444 | if (copy_in_user(&compat_fsqstat->qs_incoredqs, | ||
445 | &fsqstat->qs_incoredqs, | ||
446 | sizeof(struct compat_fs_quota_stat) - | ||
447 | offsetof(struct compat_fs_quota_stat, qs_incoredqs)) || | ||
448 | get_user(xdata, &fsqstat->qs_iwarnlimit) || | ||
449 | put_user(xdata, &compat_fsqstat->qs_iwarnlimit)) | ||
450 | break; | ||
451 | ret = 0; | ||
452 | break; | ||
453 | default: | ||
454 | ret = sys_quotactl(cmd, special, id, addr); | ||
455 | } | ||
456 | return ret; | ||
457 | } | ||
458 | #endif | ||