diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2012-07-30 14:53:19 +0100 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2012-09-24 10:46:54 +0100 |
| commit | 71f890f7f758f340215d48fed5223f9cce05b652 (patch) | |
| tree | e0a274e17e9a6e2a623fceaa47b9faf1635d7343 /fs/gfs2/rgrp.h | |
| parent | 1f981697432daea3c0abf938b39174dcfb29340e (diff) | |
| download | linux-71f890f7f758f340215d48fed5223f9cce05b652.tar.bz2 | |
GFS2: Remove rs_requested field from reservations
The rs_requested field is left over from the original allocation
code, however this should have been a parameter passed to the
various functions from gfs2_inplace_reserve() and not a member of the
reservation structure as the value is not required after the
initial allocation.
This also helps simplify the code since we no longer need to set
the rs_requested to zero. Also the gfs2_inplace_release()
function can also be simplified since the reservation structure
will always be defined when it is called, and the only remaining
task is to unlock the rgrp if required. It can also now be
called unconditionally too, resulting in a further simplification.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/rgrp.h')
| -rw-r--r-- | fs/gfs2/rgrp.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/gfs2/rgrp.h b/fs/gfs2/rgrp.h index ca6e26729b86..0b0e9cc7e3d9 100644 --- a/fs/gfs2/rgrp.h +++ b/fs/gfs2/rgrp.h @@ -73,14 +73,6 @@ extern int gfs2_rgrp_send_discards(struct gfs2_sbd *sdp, u64 offset, const struct gfs2_bitmap *bi, unsigned minlen, u64 *ptrimmed); extern int gfs2_fitrim(struct file *filp, void __user *argp); -/* This is how to tell if a multi-block reservation is "inplace" reserved: */ -static inline int gfs2_mb_reserved(struct gfs2_inode *ip) -{ - if (ip->i_res && ip->i_res->rs_requested) - return 1; - return 0; -} - /* This is how to tell if a multi-block reservation is in the rgrp tree: */ static inline int gfs2_rs_active(struct gfs2_blkreserv *rs) { |