mirror of
https://github.com/torvalds/linux
synced 2024-09-21 03:28:37 +00:00
7276b3b0c7
Fix a bug in the directory reading code, where we might have dereferenced a NULL pointer in case of OOM. Updated the directory code to use the new & improved version of gfs2_meta_ra() which now returns the first block that was being read. Previously it was releasing it requiring following code to grab the block again at each point it was called. Also turned off readahead on directory lookups since we are reading a hash table, and therefore reading the entries in order is very unlikely. Readahead is still used for all other calls to the directory reading function (e.g. when growing the hash table). Removed the DIO_START constant. Everywhere this was used, it was used to unconditionally start i/o aside from a couple of places, so I've removed it and made the couple of exceptions to this rule into separate functions. Also hunted through the other DIO flags and removed them as arguments from functions which were always called with the same combination of arguments. Updated gfs2_meta_indirect_buffer to be a bit more efficient and hopefully also be a bit easier to read. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
79 lines
2.5 KiB
C
79 lines
2.5 KiB
C
/*
|
|
* Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
|
|
* Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
|
|
*
|
|
* This copyrighted material is made available to anyone wishing to use,
|
|
* modify, copy, or redistribute it subject to the terms and conditions
|
|
* of the GNU General Public License version 2.
|
|
*/
|
|
|
|
#ifndef __DIO_DOT_H__
|
|
#define __DIO_DOT_H__
|
|
|
|
#include <linux/buffer_head.h>
|
|
#include <linux/string.h>
|
|
#include "incore.h"
|
|
|
|
static inline void gfs2_buffer_clear(struct buffer_head *bh)
|
|
{
|
|
memset(bh->b_data, 0, bh->b_size);
|
|
}
|
|
|
|
static inline void gfs2_buffer_clear_tail(struct buffer_head *bh, int head)
|
|
{
|
|
BUG_ON(head > bh->b_size);
|
|
memset(bh->b_data + head, 0, bh->b_size - head);
|
|
}
|
|
|
|
static inline void gfs2_buffer_copy_tail(struct buffer_head *to_bh,
|
|
int to_head,
|
|
struct buffer_head *from_bh,
|
|
int from_head)
|
|
{
|
|
BUG_ON(from_head < to_head);
|
|
memcpy(to_bh->b_data + to_head, from_bh->b_data + from_head,
|
|
from_bh->b_size - from_head);
|
|
memset(to_bh->b_data + to_bh->b_size + to_head - from_head,
|
|
0, from_head - to_head);
|
|
}
|
|
|
|
struct inode *gfs2_aspace_get(struct gfs2_sbd *sdp);
|
|
void gfs2_aspace_put(struct inode *aspace);
|
|
|
|
void gfs2_ail1_start_one(struct gfs2_sbd *sdp, struct gfs2_ail *ai);
|
|
int gfs2_ail1_empty_one(struct gfs2_sbd *sdp, struct gfs2_ail *ai, int flags);
|
|
void gfs2_ail2_empty_one(struct gfs2_sbd *sdp, struct gfs2_ail *ai);
|
|
void gfs2_ail_empty_gl(struct gfs2_glock *gl);
|
|
|
|
void gfs2_meta_inval(struct gfs2_glock *gl);
|
|
void gfs2_meta_sync(struct gfs2_glock *gl);
|
|
|
|
struct buffer_head *gfs2_meta_new(struct gfs2_glock *gl, u64 blkno);
|
|
int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno,
|
|
int flags, struct buffer_head **bhp);
|
|
int gfs2_meta_wait(struct gfs2_sbd *sdp, struct buffer_head *bh);
|
|
|
|
void gfs2_attach_bufdata(struct gfs2_glock *gl, struct buffer_head *bh,
|
|
int meta);
|
|
void gfs2_pin(struct gfs2_sbd *sdp, struct buffer_head *bh);
|
|
void gfs2_unpin(struct gfs2_sbd *sdp, struct buffer_head *bh,
|
|
struct gfs2_ail *ai);
|
|
|
|
void gfs2_meta_wipe(struct gfs2_inode *ip, u64 bstart, u32 blen);
|
|
|
|
void gfs2_meta_cache_flush(struct gfs2_inode *ip);
|
|
int gfs2_meta_indirect_buffer(struct gfs2_inode *ip, int height, u64 num,
|
|
int new, struct buffer_head **bhp);
|
|
|
|
static inline int gfs2_meta_inode_buffer(struct gfs2_inode *ip,
|
|
struct buffer_head **bhp)
|
|
{
|
|
return gfs2_meta_indirect_buffer(ip, 0, ip->i_num.no_addr, 0, bhp);
|
|
}
|
|
|
|
struct buffer_head *gfs2_meta_ra(struct gfs2_glock *gl, u64 dblock, u32 extlen);
|
|
void gfs2_meta_syncfs(struct gfs2_sbd *sdp);
|
|
|
|
#endif /* __DIO_DOT_H__ */
|
|
|