summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/rgrp.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-20 08:15:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-20 08:15:18 -0700
commit551395ae667d699189014f762355e9131fc03e79 (patch)
tree69bd0681b33bd12b8b5961af88ad3452afdf7b89 /fs/gfs2/rgrp.c
parenta8375bd81cf99cb81be37127eaf08316ecb87619 (diff)
parent00377d8e3842776d1da633ad9c79a16ecb548b92 (diff)
downloadop-kernel-dev-551395ae667d699189014f762355e9131fc03e79.zip
op-kernel-dev-551395ae667d699189014f762355e9131fc03e79.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: [GFS2] Prefer strlcpy() over snprintf() [GFS2] Fix cast from unsigned int to s64 [GFS2] filesystem consistency error from do_strip
Diffstat (limited to 'fs/gfs2/rgrp.c')
-rw-r--r--fs/gfs2/rgrp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 7e8f0b1..6387523 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -1495,7 +1495,7 @@ u64 gfs2_alloc_block(struct gfs2_inode *ip, unsigned int *n)
al->al_alloced += *n;
- gfs2_statfs_change(sdp, 0, -*n, 0);
+ gfs2_statfs_change(sdp, 0, -(s64)*n, 0);
gfs2_quota_change(ip, *n, ip->i_inode.i_uid, ip->i_inode.i_gid);
spin_lock(&sdp->sd_rindex_spin);
OpenPOWER on IntegriCloud