diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-07 08:52:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-07 08:52:19 -0800 |
| commit | cf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2 (patch) | |
| tree | 66ecb6f516d33915171682cc602af978c0ae014f /fs/ubifs/sb.c | |
| parent | 31555213f03bca37d2c02e10946296052f4ecfcd (diff) | |
| parent | 7606f85a701ed8feeac065e133ff9a51c267aa0d (diff) | |
| download | linux-stable-cf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2.tar.gz linux-stable-cf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2.tar.bz2 linux-stable-cf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2.zip | |
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6:
UBIFS: fix the dark space calculation
UBIFS: introduce a helper to dump scanning info
Diffstat (limited to 'fs/ubifs/sb.c')
| -rw-r--r-- | fs/ubifs/sb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c index 93d938ad3d2a..6094c5a5d7a8 100644 --- a/fs/ubifs/sb.c +++ b/fs/ubifs/sb.c @@ -247,7 +247,7 @@ static int create_default_filesystem(struct ubifs_info *c) mst->total_dirty = cpu_to_le64(tmp64); /* The indexing LEB does not contribute to dark space */ - tmp64 = (c->main_lebs - 1) * c->dark_wm; + tmp64 = ((long long)(c->main_lebs - 1) * c->dark_wm); mst->total_dark = cpu_to_le64(tmp64); mst->total_used = cpu_to_le64(UBIFS_INO_NODE_SZ); |