From 3bfcf9f6c914701e1080b5b4128cf024831ddd50 Mon Sep 17 00:00:00 2001
From: Oleg Drokin <green@linuxhacker.ru>
Date: Mon, 28 Nov 2005 13:43:53 -0800
Subject: [PATCH] --- yaml --- r: 14717 b: refs/heads/master c:
 7729ac5efe156129d172784fedeaddb2167a1914 h: refs/heads/master i:   14715:
 c15bffd8e64ea65586d40e6caa71898b93e48ec9 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/reiserfs/inode.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2649905c558a..215a2a5586fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a9c3f78a32ddc4ec50f5da2cf2db5db6f442986
+refs/heads/master: 7729ac5efe156129d172784fedeaddb2167a1914
diff --git a/trunk/fs/reiserfs/inode.c b/trunk/fs/reiserfs/inode.c
index 5f82352b97e1..0a044ad98885 100644
--- a/trunk/fs/reiserfs/inode.c
+++ b/trunk/fs/reiserfs/inode.c
@@ -2194,7 +2194,7 @@ static int map_block_for_writepage(struct inode *inode,
 	INITIALIZE_PATH(path);
 	int pos_in_item;
 	int jbegin_count = JOURNAL_PER_BALANCE_CNT;
-	loff_t byte_offset = (block << inode->i_sb->s_blocksize_bits) + 1;
+	loff_t byte_offset = ((loff_t)block << inode->i_sb->s_blocksize_bits)+1;
 	int retval;
 	int use_get_block = 0;
 	int bytes_copied = 0;