summaryrefslogtreecommitdiffstats
path: root/fs/gfs2
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2011-11-09 13:46:06 +0000
committerSteven Whitehouse <swhiteho@redhat.com>2011-11-09 13:46:06 +0000
commit79c4c379c8f16a12c28ea2084db5138e33d17ebd (patch)
treef0d9648c0e4d1a087401c2e2cb7a4e5e9c80a99b /fs/gfs2
parent114b80ce2c05f91f10fffbf303080357d73c0675 (diff)
downloadlinux-stable-79c4c379c8f16a12c28ea2084db5138e33d17ebd.tar.gz
linux-stable-79c4c379c8f16a12c28ea2084db5138e33d17ebd.tar.bz2
linux-stable-79c4c379c8f16a12c28ea2084db5138e33d17ebd.zip
GFS2: f_ra is always valid in dir readahead function
As a result, we don't need to test it each time. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com> Cc: Bob Peterson <rpeterso@redhat.com>
Diffstat (limited to 'fs/gfs2')
-rw-r--r--fs/gfs2/dir.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index 91441171bf25..946b6f88939e 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -1378,12 +1378,14 @@ out:
return error;
}
-/* gfs2_dir_readahead - Issue read-ahead requests for leaf blocks.
+/**
+ * gfs2_dir_readahead - Issue read-ahead requests for leaf blocks.
*
* Note: we can't calculate each index like dir_e_read can because we don't
* have the leaf, and therefore we don't have the depth, and therefore we
* don't have the length. So we have to just read enough ahead to make up
- * for the loss of information. */
+ * for the loss of information.
+ */
static void gfs2_dir_readahead(struct inode *inode, unsigned hsize, u32 index,
struct file_ra_state *f_ra)
{
@@ -1394,7 +1396,7 @@ static void gfs2_dir_readahead(struct inode *inode, unsigned hsize, u32 index,
unsigned count;
/* First check if we've already read-ahead for the whole range. */
- if (!f_ra || index + MAX_RA_BLOCKS < f_ra->start)
+ if (index + MAX_RA_BLOCKS < f_ra->start)
return;
f_ra->start = max((pgoff_t)index, f_ra->start);
@@ -1448,7 +1450,7 @@ static int dir_e_read(struct inode *inode, u64 *offset, void *opaque,
hash = gfs2_dir_offset2hash(*offset);
index = hash >> (32 - dip->i_depth);
- if (f_ra && dip->i_hash_cache == NULL)
+ if (dip->i_hash_cache == NULL)
f_ra->start = 0;
lp = gfs2_dir_get_hash_table(dip);
if (IS_ERR(lp))