aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Whitehouse <steve@men-an-tol.chygwyn.com>2006-01-24 10:37:06 +0000
committerSteven Whitehouse <steve@men-an-tol.chygwyn.com>2006-01-24 10:37:06 +0000
commitaa6a85a971065b013a71a399c3fc4312e2dd81eb (patch)
treeae2d11d0ec557f17cce29e79b18df29b78f9b0f7
parent8ca05c60de49c3bb523a435abc216b6b6eeb1067 (diff)
[GFS2] Remove pointless argument relating to truncate
For some reason a function pointer was being passed through the truncate code which only ever took one value. This removes the function pointer and replaces it with a single call to the function in question. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
-rw-r--r--fs/gfs2/bmap.c15
-rw-r--r--fs/gfs2/bmap.h3
-rw-r--r--fs/gfs2/ops_inode.c2
3 files changed, 8 insertions, 12 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index 967cbc68195..ff4a9175b4e 100644
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -841,8 +841,7 @@ static int truncator_journaled(struct gfs2_inode *ip, uint64_t size)
return 0;
}
-static int trunc_start(struct gfs2_inode *ip, uint64_t size,
- gfs2_truncator_t truncator)
+static int trunc_start(struct gfs2_inode *ip, uint64_t size)
{
struct gfs2_sbd *sdp = ip->i_sbd;
struct buffer_head *dibh;
@@ -873,7 +872,7 @@ static int trunc_start(struct gfs2_inode *ip, uint64_t size,
if (do_div(junk, sdp->sd_jbsize))
error = truncator_journaled(ip, size);
} else if (size & (uint64_t)(sdp->sd_sb.sb_bsize - 1))
- error = truncator(ip, size);
+ error = gfs2_truncator_page(ip, size);
if (!error) {
ip->i_di.di_size = size;
@@ -980,12 +979,11 @@ static int trunc_end(struct gfs2_inode *ip)
* Returns: errno
*/
-static int do_shrink(struct gfs2_inode *ip, uint64_t size,
- gfs2_truncator_t truncator)
+static int do_shrink(struct gfs2_inode *ip, uint64_t size)
{
int error;
- error = trunc_start(ip, size, truncator);
+ error = trunc_start(ip, size);
if (error < 0)
return error;
if (error > 0)
@@ -1009,8 +1007,7 @@ static int do_shrink(struct gfs2_inode *ip, uint64_t size,
* Returns: errno
*/
-int gfs2_truncatei(struct gfs2_inode *ip, uint64_t size,
- gfs2_truncator_t truncator)
+int gfs2_truncatei(struct gfs2_inode *ip, uint64_t size)
{
int error;
@@ -1020,7 +1017,7 @@ int gfs2_truncatei(struct gfs2_inode *ip, uint64_t size,
if (size > ip->i_di.di_size)
error = do_grow(ip, size);
else
- error = do_shrink(ip, size, truncator);
+ error = do_shrink(ip, size);
return error;
}
diff --git a/fs/gfs2/bmap.h b/fs/gfs2/bmap.h
index 25ea32905c6..b83b5924828 100644
--- a/fs/gfs2/bmap.h
+++ b/fs/gfs2/bmap.h
@@ -23,8 +23,7 @@ int gfs2_block_map(struct gfs2_inode *ip,
uint64_t *dblock, uint32_t *extlen);
typedef int (*gfs2_truncator_t) (struct gfs2_inode * ip, uint64_t size);
-int gfs2_truncatei(struct gfs2_inode *ip, uint64_t size,
- gfs2_truncator_t truncator);
+int gfs2_truncatei(struct gfs2_inode *ip, uint64_t size);
int gfs2_truncatei_resume(struct gfs2_inode *ip);
int gfs2_file_dealloc(struct gfs2_inode *ip);
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
index 89417a6cb72..6fff30ef8b7 100644
--- a/fs/gfs2/ops_inode.c
+++ b/fs/gfs2/ops_inode.c
@@ -994,7 +994,7 @@ static int setattr_size(struct inode *inode, struct iattr *attr)
return error;
}
- error = gfs2_truncatei(ip, attr->ia_size, gfs2_truncator_page);
+ error = gfs2_truncatei(ip, attr->ia_size);
if (error)
return error;