← Back to branch summary

~ubuntu-branches/debian/jessie/ufsutils/jessie

« back to all changes in this revision

Viewing changes to include/ufs/ffs/ffs_snapshot.c

  • Committer: Bazaar Package Importer
  • Author(s): Aurelien Jarno, Petr Salinger, Aurelien Jarno
  • Date: 2010-04-13 22:20:32 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20100413222032-je6xhqdvomf3yrj2
Tags: 7.3-1
http://bugs.debian.org/559647
[ Petr Salinger ]
* New upstream version (RELENG_7_3_0_RELEASE)
* Use intmax_t cast in fsbtodb() to fix aborts when 
  making a filesystem larger than one terabyte. Closes: #559647.

[ Aurelien Jarno ]
* Bump Standard-Versions to 3.8.4 (no changes).

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/ufs/ffs/ffs_snapshot.c
34
34
 */
35
35
 
36
36
#include <sys/cdefs.h>
37
 
__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_snapshot.c,v 1.136.2.4.2.1 2009/04/15 03:14:26 kensmith Exp $");
 
37
__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_snapshot.c,v 1.136.2.6.2.1 2010/02/10 00:26:20 kensmith Exp $");
38
38
 
39
39
#include "opt_quota.h"
40
40
 
41
41
#include <sys/param.h>
 
42
#include <sys/systm.h>
42
43
#include <sys/kernel.h>
43
 
#include <sys/systm.h>
44
44
#include <sys/conf.h>
45
45
#include <sys/bio.h>
46
46
#include <sys/buf.h>
 
47
#include <sys/fcntl.h>
47
48
#include <sys/proc.h>
48
49
#include <sys/namei.h>
49
50
#include <sys/sched.h>
2272
2273
                        VI_UNLOCK(devvp);
2273
2274
                        if (saved_runningbufspace != 0) {
2274
2275
                                bp->b_runningbufspace = saved_runningbufspace;
2275
 
                                atomic_add_int(&runningbufspace,
 
2276
                                atomic_add_long(&runningbufspace,
2276
2277
                                               bp->b_runningbufspace);
2277
2278
                        }
2278
2279
                        return (0);             /* Snapshot gone */
2397
2398
         */
2398
2399
        if (saved_runningbufspace != 0) {
2399
2400
                bp->b_runningbufspace = saved_runningbufspace;
2400
 
                atomic_add_int(&runningbufspace, bp->b_runningbufspace);
 
2401
                atomic_add_long(&runningbufspace, bp->b_runningbufspace);
2401
2402
        }
2402
2403
        return (error);
2403
2404
}