diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-22 21:49:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-22 21:49:07 -0700 |
| commit | bccaeafd7c117acee36e90d37c7e05c19be9e7bf (patch) | |
| tree | d784e96c416ce5d2f47ecae6c0bb2a2aa8f5d1f3 /fs/jfs/resize.c | |
| parent | 68d0080f1e222757c85606d3eaf81b5c4aa7719f (diff) | |
| parent | ecc90462b428db2ad2ee5081c45496ed10f3a633 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
jfs: agstart field must be 64 bits
JFS: Don't save agno in the inode
jfs: Update agstart when resizing volume
jfs: old_agsize should be 64 bits in jfs_extendfs
Diffstat (limited to 'fs/jfs/resize.c')
| -rw-r--r-- | fs/jfs/resize.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/resize.c b/fs/jfs/resize.c index 8ea5efb5a34..8d0c1c7c082 100644 --- a/fs/jfs/resize.c +++ b/fs/jfs/resize.c @@ -80,7 +80,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize) int log_formatted = 0; struct inode *iplist[1]; struct jfs_superblock *j_sb, *j_sb2; - uint old_agsize; + s64 old_agsize; int agsizechanged = 0; struct buffer_head *bh, *bh2; |