Index: ufs/ufs/ufs_quota.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/ufs/ufs_quota.c,v
retrieving revision 1.112
diff -p -r1.112 ufs_quota.c
*** ufs/ufs/ufs_quota.c	9 Sep 2012 04:27:49 -0000	1.112
--- ufs/ufs/ufs_quota.c	19 Oct 2013 20:12:46 -0000
*************** quota_handle_cmd_cursorget(struct mount 
*** 474,492 ****
      struct quotactl_args *args)
  {
  	struct ufsmount *ump = VFSTOUFS(mp);
- 	struct quotakcursor *cursor;
- 	struct quotakey *keys;
- 	struct quotaval *vals;
- 	unsigned maxnum;
- 	unsigned *ret;
  	int error;
  
  	KASSERT(args->qc_op == QUOTACTL_CURSORGET);
- 	cursor = args->u.cursorget.qc_cursor;
- 	keys = args->u.cursorget.qc_keys;
- 	vals = args->u.cursorget.qc_vals;
- 	maxnum = args->u.cursorget.qc_maxnum;
- 	ret = args->u.cursorget.qc_ret;
  
  	if ((ump->um_flags & UFS_QUOTA2) == 0)
  		return EOPNOTSUPP;
--- 474,482 ----
*************** quota_handle_cmd_cursorget(struct mount 
*** 498,503 ****
--- 488,499 ----
  		
  #ifdef QUOTA2
  	if (ump->um_flags & UFS_QUOTA2) {
+ 		struct quotakcursor *cursor = args->u.cursorget.qc_cursor;
+ 		struct quotakey *keys = args->u.cursorget.qc_keys;
+ 		struct quotaval *vals = args->u.cursorget.qc_vals;
+ 		unsigned maxnum = args->u.cursorget.qc_maxnum;
+ 		unsigned *ret = args->u.cursorget.qc_ret;
+ 
  		error = quota2_handle_cmd_cursorget(ump, cursor, keys, vals,
  						    maxnum, ret);
  	} else
*************** quota_handle_cmd_cursoropen(struct mount
*** 514,524 ****
  #ifdef QUOTA2
  	struct ufsmount *ump = VFSTOUFS(mp);
  #endif
- 	struct quotakcursor *cursor;
  	int error;
  
  	KASSERT(args->qc_op == QUOTACTL_CURSOROPEN);
- 	cursor = args->u.cursoropen.qc_cursor;
  
  	error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_FS_QUOTA,
  	    KAUTH_REQ_SYSTEM_FS_QUOTA_GET, mp, NULL, NULL);
--- 510,518 ----
*************** quota_handle_cmd_cursoropen(struct mount
*** 527,532 ****
--- 521,528 ----
  
  #ifdef QUOTA2
  	if (ump->um_flags & UFS_QUOTA2) {
+ 		struct quotakcursor *cursor = args->u.cursoropen.qc_cursor;
+ 
  		error = quota2_handle_cmd_cursoropen(ump, cursor);
  	} else
  #endif
*************** quota_handle_cmd_cursorclose(struct moun
*** 542,552 ****
  #ifdef QUOTA2
  	struct ufsmount *ump = VFSTOUFS(mp);
  #endif
- 	struct quotakcursor *cursor;
  	int error;
  
  	KASSERT(args->qc_op == QUOTACTL_CURSORCLOSE);
- 	cursor = args->u.cursorclose.qc_cursor;
  
  	error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_FS_QUOTA,
  	    KAUTH_REQ_SYSTEM_FS_QUOTA_GET, mp, NULL, NULL);
--- 538,546 ----
*************** quota_handle_cmd_cursorclose(struct moun
*** 555,560 ****
--- 549,556 ----
  
  #ifdef QUOTA2
  	if (ump->um_flags & UFS_QUOTA2) {
+ 		struct quotakcursor *cursor = args->u.cursorclose.qc_cursor;
+ 
  		error = quota2_handle_cmd_cursorclose(ump, cursor);
  	} else
  #endif
*************** quota_handle_cmd_cursorskipidtype(struct
*** 570,585 ****
  #ifdef QUOTA2
  	struct ufsmount *ump = VFSTOUFS(mp);
  #endif
- 	struct quotakcursor *cursor;
- 	int idtype;
  	int error;
  
  	KASSERT(args->qc_op == QUOTACTL_CURSORSKIPIDTYPE);
- 	cursor = args->u.cursorskipidtype.qc_cursor;
- 	idtype = args->u.cursorskipidtype.qc_idtype;
  
  #ifdef QUOTA2
  	if (ump->um_flags & UFS_QUOTA2) {
  		error = quota2_handle_cmd_cursorskipidtype(ump, cursor, idtype);
  	} else
  #endif
--- 566,581 ----
  #ifdef QUOTA2
  	struct ufsmount *ump = VFSTOUFS(mp);
  #endif
  	int error;
  
  	KASSERT(args->qc_op == QUOTACTL_CURSORSKIPIDTYPE);
  
  #ifdef QUOTA2
  	if (ump->um_flags & UFS_QUOTA2) {
+ 		struct quotakcursor *cursor =
+ 			     args->u.cursorskipidtype.qc_cursor;
+ 		int idtype = args->u.cursorskipidtype.qc_idtype;
+ 
  		error = quota2_handle_cmd_cursorskipidtype(ump, cursor, idtype);
  	} else
  #endif
*************** quota_handle_cmd_cursoratend(struct moun
*** 595,610 ****
  #ifdef QUOTA2
  	struct ufsmount *ump = VFSTOUFS(mp);
  #endif
- 	struct quotakcursor *cursor;
- 	int *ret;
  	int error;
  
  	KASSERT(args->qc_op == QUOTACTL_CURSORATEND);
- 	cursor = args->u.cursoratend.qc_cursor;
- 	ret = args->u.cursoratend.qc_ret;
  
  #ifdef QUOTA2
  	if (ump->um_flags & UFS_QUOTA2) {
  		error = quota2_handle_cmd_cursoratend(ump, cursor, ret);
  	} else
  #endif
--- 591,605 ----
  #ifdef QUOTA2
  	struct ufsmount *ump = VFSTOUFS(mp);
  #endif
  	int error;
  
  	KASSERT(args->qc_op == QUOTACTL_CURSORATEND);
  
  #ifdef QUOTA2
  	if (ump->um_flags & UFS_QUOTA2) {
+ 		struct quotakcursor *cursor = args->u.cursoratend.qc_cursor;
+ 		unsigned *ret = args->u.cursoratend.qc_ret;
+ 
  		error = quota2_handle_cmd_cursoratend(ump, cursor, ret);
  	} else
  #endif
*************** quota_handle_cmd_cursorrewind(struct mou
*** 620,633 ****
  #ifdef QUOTA2
  	struct ufsmount *ump = VFSTOUFS(mp);
  #endif
- 	struct quotakcursor *cursor;
  	int error;
  
  	KASSERT(args->qc_op == QUOTACTL_CURSORREWIND);
- 	cursor = args->u.cursorrewind.qc_cursor;
  
  #ifdef QUOTA2
  	if (ump->um_flags & UFS_QUOTA2) {
  		error = quota2_handle_cmd_cursorrewind(ump, cursor);
  	} else
  #endif
--- 615,628 ----
  #ifdef QUOTA2
  	struct ufsmount *ump = VFSTOUFS(mp);
  #endif
  	int error;
  
  	KASSERT(args->qc_op == QUOTACTL_CURSORREWIND);
  
  #ifdef QUOTA2
  	if (ump->um_flags & UFS_QUOTA2) {
+ 		struct quotakcursor *cursor = args->u.cursorrewind.qc_cursor;
+ 
  		error = quota2_handle_cmd_cursorrewind(ump, cursor);
  	} else
  #endif
*************** quota_handle_cmd_quotaon(struct mount *m
*** 641,653 ****
      struct quotactl_args *args)
  {
  	struct ufsmount *ump = VFSTOUFS(mp);
- 	int idtype;
- 	const char *qfile;
  	int error;
  
  	KASSERT(args->qc_op == QUOTACTL_QUOTAON);
- 	idtype = args->u.quotaon.qc_idtype;
- 	qfile = args->u.quotaon.qc_quotafile;
  
  	if ((ump->um_flags & UFS_QUOTA2) != 0)
  		return EBUSY;
--- 636,644 ----
*************** quota_handle_cmd_quotaon(struct mount *m
*** 658,664 ****
  		return error;
  	}
  #ifdef QUOTA
! 	error = quota1_handle_cmd_quotaon(l, ump, idtype, qfile);
  #else
  	error = EOPNOTSUPP;
  #endif
--- 649,660 ----
  		return error;
  	}
  #ifdef QUOTA
! 	{
! 		const char *qfile = args->u.quotaon.qc_quotafile;
! 		int idtype = args->u.quotaon.qc_idtype;
! 
! 		error = quota1_handle_cmd_quotaon(l, ump, idtype, qfile);
! 	}
  #else
  	error = EOPNOTSUPP;
  #endif
*************** quota_handle_cmd_quotaoff(struct mount *
*** 671,681 ****
      struct quotactl_args *args)
  {
  	struct ufsmount *ump = VFSTOUFS(mp);
- 	int idtype;
  	int error;
  
  	KASSERT(args->qc_op == QUOTACTL_QUOTAOFF);
- 	idtype = args->u.quotaoff.qc_idtype;
  
  	if ((ump->um_flags & UFS_QUOTA2) != 0)
  		return EOPNOTSUPP;
--- 667,675 ----
*************** quota_handle_cmd_quotaoff(struct mount *
*** 686,692 ****
  		return error;
  	}
  #ifdef QUOTA
! 	error = quota1_handle_cmd_quotaoff(l, ump, idtype);
  #else
  	error = EOPNOTSUPP;
  #endif
--- 680,690 ----
  		return error;
  	}
  #ifdef QUOTA
! 	{
! 		int idtype = args->u.quotaoff.qc_idtype;
! 
! 		error = quota1_handle_cmd_quotaoff(l, ump, idtype);
! 	}
  #else
  	error = EOPNOTSUPP;
  #endif