diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-18 14:10:52 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-18 14:10:52 -0400 |
| commit | 1b50259bc33f2adfcb4c5fba4b740bf80789df22 (patch) | |
| tree | f8d20f032c9cb85883cdee846423667543947dde /fs/gfs2/page.c | |
| parent | 02f211f4d0e67794020ba1babbdaf7c45d56db45 (diff) | |
[GFS2] Drop log lock on I/O error & tidy up
This patch drops the log spinlock when an I/O error occurs
to avoid any possible problems in case of blocking or
recursion in the I/O error routine. It also has a few
cosmetic changes to tidy up various other files.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/page.c')
| -rw-r--r-- | fs/gfs2/page.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/gfs2/page.c b/fs/gfs2/page.c index a2c9e93c7c39..495db5594164 100644 --- a/fs/gfs2/page.c +++ b/fs/gfs2/page.c @@ -155,11 +155,9 @@ int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh, if (!PageUptodate(page)) { void *kaddr = kmap(page); - memcpy(kaddr, - dibh->b_data + sizeof(struct gfs2_dinode), + memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), ip->i_di.di_size); - memset(kaddr + ip->i_di.di_size, - 0, + memset(kaddr + ip->i_di.di_size, 0, PAGE_CACHE_SIZE - ip->i_di.di_size); kunmap(page); |