diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-29 23:56:07 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-29 23:56:07 -0500 |
| commit | 606c0dafbe88102d64c1253caed8a2c36987070f (patch) | |
| tree | 23ce7b30341e71c6da8e0183d27e29167e833e26 /fs/reiserfs/inode.c | |
| parent | 6ab16d249513a50bef3f1b275cea6aa8d3f51832 (diff) | |
| parent | d2ef5ebb4c4fe141a82252d4db8d8521e6765c5a (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/reiserfs/inode.c')
| -rw-r--r-- | fs/reiserfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index 5f82352b97e1..0a044ad98885 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c | |||
| @@ -2194,7 +2194,7 @@ static int map_block_for_writepage(struct inode *inode, | |||
| 2194 | INITIALIZE_PATH(path); | 2194 | INITIALIZE_PATH(path); |
| 2195 | int pos_in_item; | 2195 | int pos_in_item; |
| 2196 | int jbegin_count = JOURNAL_PER_BALANCE_CNT; | 2196 | int jbegin_count = JOURNAL_PER_BALANCE_CNT; |
| 2197 | loff_t byte_offset = (block << inode->i_sb->s_blocksize_bits) + 1; | 2197 | loff_t byte_offset = ((loff_t)block << inode->i_sb->s_blocksize_bits)+1; |
| 2198 | int retval; | 2198 | int retval; |
| 2199 | int use_get_block = 0; | 2199 | int use_get_block = 0; |
| 2200 | int bytes_copied = 0; | 2200 | int bytes_copied = 0; |