From b096acc6f15efdf51974503bff4b7275816593cd Mon Sep 17 00:00:00 2001 From: Joel Becker Date: Fri, 23 Apr 2010 15:24:59 -0700 Subject: [PATCH] --- yaml --- r: 190553 b: refs/heads/master c: a36d515c7a2dfacebcf41729f6812dbc424ebcf0 h: refs/heads/master i: 190551: ef5f32487d65a4087a9e031a5efd4503dc054356 v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/dlmfs/dlmfs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8b08231073e0..ec47f51b719e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c21a534e2f24968cf74976a4e721ac194db30ded +refs/heads/master: a36d515c7a2dfacebcf41729f6812dbc424ebcf0 diff --git a/trunk/fs/ocfs2/dlmfs/dlmfs.c b/trunk/fs/ocfs2/dlmfs/dlmfs.c index a99d1eafa8e2..b83d6107a1f5 100644 --- a/trunk/fs/ocfs2/dlmfs/dlmfs.c +++ b/trunk/fs/ocfs2/dlmfs/dlmfs.c @@ -262,7 +262,7 @@ static ssize_t dlmfs_file_read(struct file *filp, if ((count + *ppos) > i_size_read(inode)) readlen = i_size_read(inode) - *ppos; else - readlen = count - *ppos; + readlen = count; lvb_buf = kmalloc(readlen, GFP_NOFS); if (!lvb_buf)