Commit 76d5b28b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs 

Pull quota update from Jan Kara:
 "time64 support for quota"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  quota: use time64_t internally
parents 71e9dcc0 e008bb61

fs/ocfs2/quota_global.c

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ int __ocfs2_sync_dquot(struct dquot *dquot, int freeing) 
	struct ocfs2_mem_dqinfo *info = sb_dqinfo(sb, type)->dqi_priv;

	struct ocfs2_global_disk_dqblk dqblk;

	s64 spacechange, inodechange;

	time_t olditime, oldbtime;

	time64_t olditime, oldbtime;



	err = sb->s_op->quota_read(sb, type, (char *)&dqblk,

				   sizeof(struct ocfs2_global_disk_dqblk),

fs/quota/dquot.c

+8 −8
Original line number Diff line number Diff line
@@ -1133,7 +1133,7 @@ static void dquot_decr_inodes(struct dquot *dquot, qsize_t number) 
	else

		dquot->dq_dqb.dqb_curinodes = 0;

	if (dquot->dq_dqb.dqb_curinodes <= dquot->dq_dqb.dqb_isoftlimit)

		dquot->dq_dqb.dqb_itime = (time_t) 0;

		dquot->dq_dqb.dqb_itime = (time64_t) 0;

	clear_bit(DQ_INODES_B, &dquot->dq_flags);

}
@@ -1145,7 +1145,7 @@ static void dquot_decr_space(struct dquot *dquot, qsize_t number) 
	else

		dquot->dq_dqb.dqb_curspace = 0;

	if (dquot->dq_dqb.dqb_curspace <= dquot->dq_dqb.dqb_bsoftlimit)

		dquot->dq_dqb.dqb_btime = (time_t) 0;

		dquot->dq_dqb.dqb_btime = (time64_t) 0;

	clear_bit(DQ_BLKS_B, &dquot->dq_flags);

}
@@ -1292,7 +1292,7 @@ static int check_idq(struct dquot *dquot, qsize_t inodes, 
	if (dquot->dq_dqb.dqb_isoftlimit &&

	    newinodes > dquot->dq_dqb.dqb_isoftlimit &&

	    dquot->dq_dqb.dqb_itime &&

	    get_seconds() >= dquot->dq_dqb.dqb_itime &&

	    ktime_get_real_seconds() >= dquot->dq_dqb.dqb_itime &&

            !ignore_hardlimit(dquot)) {

		prepare_warning(warn, dquot, QUOTA_NL_ISOFTLONGWARN);

		return -EDQUOT;
@@ -1302,7 +1302,7 @@ static int check_idq(struct dquot *dquot, qsize_t inodes, 
	    newinodes > dquot->dq_dqb.dqb_isoftlimit &&

	    dquot->dq_dqb.dqb_itime == 0) {

		prepare_warning(warn, dquot, QUOTA_NL_ISOFTWARN);

		dquot->dq_dqb.dqb_itime = get_seconds() +

		dquot->dq_dqb.dqb_itime = ktime_get_real_seconds() +

		    sb_dqopt(dquot->dq_sb)->info[dquot->dq_id.type].dqi_igrace;

	}
@@ -1334,7 +1334,7 @@ static int check_bdq(struct dquot *dquot, qsize_t space, int prealloc, 
	if (dquot->dq_dqb.dqb_bsoftlimit &&

	    tspace > dquot->dq_dqb.dqb_bsoftlimit &&

	    dquot->dq_dqb.dqb_btime &&

	    get_seconds() >= dquot->dq_dqb.dqb_btime &&

	    ktime_get_real_seconds() >= dquot->dq_dqb.dqb_btime &&

            !ignore_hardlimit(dquot)) {

		if (!prealloc)

			prepare_warning(warn, dquot, QUOTA_NL_BSOFTLONGWARN);
@@ -1346,7 +1346,7 @@ static int check_bdq(struct dquot *dquot, qsize_t space, int prealloc, 
	    dquot->dq_dqb.dqb_btime == 0) {

		if (!prealloc) {

			prepare_warning(warn, dquot, QUOTA_NL_BSOFTWARN);

			dquot->dq_dqb.dqb_btime = get_seconds() +

			dquot->dq_dqb.dqb_btime = ktime_get_real_seconds() +

			    sb_dqopt(sb)->info[dquot->dq_id.type].dqi_bgrace;

		}

		else
@@ -2695,7 +2695,7 @@ static int do_set_dqblk(struct dquot *dquot, struct qc_dqblk *di) 
			clear_bit(DQ_BLKS_B, &dquot->dq_flags);

		} else if (!(di->d_fieldmask & QC_SPC_TIMER))

			/* Set grace only if user hasn't provided his own... */

			dm->dqb_btime = get_seconds() + dqi->dqi_bgrace;

			dm->dqb_btime = ktime_get_real_seconds() + dqi->dqi_bgrace;

	}

	if (check_ilim) {

		if (!dm->dqb_isoftlimit ||
@@ -2704,7 +2704,7 @@ static int do_set_dqblk(struct dquot *dquot, struct qc_dqblk *di) 
			clear_bit(DQ_INODES_B, &dquot->dq_flags);

		} else if (!(di->d_fieldmask & QC_INO_TIMER))

			/* Set grace only if user hasn't provided his own... */

			dm->dqb_itime = get_seconds() + dqi->dqi_igrace;

			dm->dqb_itime = ktime_get_real_seconds() + dqi->dqi_igrace;

	}

	if (dm->dqb_bhardlimit || dm->dqb_bsoftlimit || dm->dqb_ihardlimit ||

	    dm->dqb_isoftlimit)

include/linux/quota.h

+2 −2
Original line number Diff line number Diff line
@@ -200,8 +200,8 @@ struct mem_dqblk { 
	qsize_t dqb_ihardlimit;	/* absolute limit on allocated inodes */

	qsize_t dqb_isoftlimit;	/* preferred inode limit */

	qsize_t dqb_curinodes;	/* current # allocated inodes */

	time_t dqb_btime;	/* time limit for excessive disk use */

	time_t dqb_itime;	/* time limit for excessive inode use */

	time64_t dqb_btime;	/* time limit for excessive disk use */

	time64_t dqb_itime;	/* time limit for excessive inode use */

};



/*