Merge commit 'v2.6.34-rc2' into perf/core

Merge reason: Pick up latest perf fixes from upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 7 insertions, 3 deletions

diff --git a/include/linux/coredump.h b/include/linux/coredump.h
index b3c91d7cede4..8ba66a9d9022 100644
--- a/include/linux/coredump.h
+++ b/include/linux/coredump.h
@@ -16,6 +16,8 @@ static inline int dump_write(struct file *file, const void *addr, int nr)
 
 static inline int dump_seek(struct file *file, loff_t off)
 {
+        int ret = 1;
+
         if (file->f_op->llseek && file->f_op->llseek != no_llseek) {
                 if (file->f_op->llseek(file, off, SEEK_CUR) < 0)
                         return 0;
@@ -29,13 +31,15 @@ static inline int dump_seek(struct file *file, loff_t off)
 
                         if (n > PAGE_SIZE)
                                 n = PAGE_SIZE;
-                        if (!dump_write(file, buf, n))
-                                return 0;
+                        if (!dump_write(file, buf, n)) {
+                                ret = 0;
+                                break;
+                        }
                         off -= n;
                 }
                 free_page((unsigned long)buf);
         }
-        return 1;
+        return ret;
 }
 
 #endif /* _LINUX_COREDUMP_H */