Commit 458094c2 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher

gfs2: Simplify the buf_limit and databuf_limit definitions

The BUF_OFFSET and DATABUF_OFFSET definitions are only used in buf_limit
and databuf_limit, respectively, and the rounding done in those
definitions is immediately wiped out by dividing by the element size.
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 736b2f77
...@@ -10,13 +10,6 @@ ...@@ -10,13 +10,6 @@
#include <linux/list.h> #include <linux/list.h>
#include "incore.h" #include "incore.h"
#define BUF_OFFSET \
((sizeof(struct gfs2_log_descriptor) + sizeof(__be64) - 1) & \
~(sizeof(__be64) - 1))
#define DATABUF_OFFSET \
((sizeof(struct gfs2_log_descriptor) + (2 * sizeof(__be64) - 1)) & \
~(2 * sizeof(__be64) - 1))
extern const struct gfs2_log_operations *gfs2_log_ops[]; extern const struct gfs2_log_operations *gfs2_log_ops[];
extern void gfs2_log_incr_head(struct gfs2_sbd *sdp); extern void gfs2_log_incr_head(struct gfs2_sbd *sdp);
extern u64 gfs2_log_bmap(struct gfs2_jdesc *jd, unsigned int lbn); extern u64 gfs2_log_bmap(struct gfs2_jdesc *jd, unsigned int lbn);
...@@ -29,18 +22,12 @@ extern int gfs2_find_jhead(struct gfs2_jdesc *jd, ...@@ -29,18 +22,12 @@ extern int gfs2_find_jhead(struct gfs2_jdesc *jd,
struct gfs2_log_header_host *head, bool keep_cache); struct gfs2_log_header_host *head, bool keep_cache);
static inline unsigned int buf_limit(struct gfs2_sbd *sdp) static inline unsigned int buf_limit(struct gfs2_sbd *sdp)
{ {
unsigned int limit; return sdp->sd_ldptrs;
limit = (sdp->sd_sb.sb_bsize - BUF_OFFSET) / sizeof(__be64);
return limit;
} }
static inline unsigned int databuf_limit(struct gfs2_sbd *sdp) static inline unsigned int databuf_limit(struct gfs2_sbd *sdp)
{ {
unsigned int limit; return sdp->sd_ldptrs / 2;
limit = (sdp->sd_sb.sb_bsize - DATABUF_OFFSET) / (2 * sizeof(__be64));
return limit;
} }
static inline void lops_before_commit(struct gfs2_sbd *sdp, static inline void lops_before_commit(struct gfs2_sbd *sdp,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment