diff --git a/[refs] b/[refs]
index b0ac3003c711..8232312c1ea6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e199ceee15c8f8652cc3bb97651bdf246ba23c5f
+refs/heads/master: 16abef0e9e79643827fd5a2a14a07bced851ae72
diff --git a/trunk/fs/read_write.c b/trunk/fs/read_write.c
index 49a98718ecdf..f0d1240a5c69 100644
--- a/trunk/fs/read_write.c
+++ b/trunk/fs/read_write.c
@@ -33,7 +33,7 @@ EXPORT_SYMBOL(generic_ro_fops);
 
 loff_t generic_file_llseek(struct file *file, loff_t offset, int origin)
 {
-	long long retval;
+	loff_t retval;
 	struct inode *inode = file->f_mapping->host;
 
 	mutex_lock(&inode->i_mutex);
@@ -60,7 +60,7 @@ EXPORT_SYMBOL(generic_file_llseek);
 
 loff_t remote_llseek(struct file *file, loff_t offset, int origin)
 {
-	long long retval;
+	loff_t retval;
 
 	lock_kernel();
 	switch (origin) {
@@ -91,7 +91,7 @@ EXPORT_SYMBOL(no_llseek);
 
 loff_t default_llseek(struct file *file, loff_t offset, int origin)
 {
-	long long retval;
+	loff_t retval;
 
 	lock_kernel();
 	switch (origin) {
diff --git a/trunk/fs/seq_file.c b/trunk/fs/seq_file.c
index 853770274f20..9943408b315e 100644
--- a/trunk/fs/seq_file.c
+++ b/trunk/fs/seq_file.c
@@ -239,7 +239,7 @@ static int traverse(struct seq_file *m, loff_t offset)
 loff_t seq_lseek(struct file *file, loff_t offset, int origin)
 {
 	struct seq_file *m = (struct seq_file *)file->private_data;
-	long long retval = -EINVAL;
+	loff_t retval = -EINVAL;
 
 	mutex_lock(&m->lock);
 	m->version = file->f_version;