Skip to content

Commit

Permalink
gfs2: Simplify the buf_limit and databuf_limit definitions
Browse files Browse the repository at this point in the history
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: Andreas Gruenbacher <[email protected]>
  • Loading branch information
Andreas Gruenbacher committed Jan 19, 2021
1 parent 736b2f7 commit 458094c
Showing 1 changed file with 2 additions and 15 deletions.
17 changes: 2 additions & 15 deletions fs/gfs2/lops.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@
#include <linux/list.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 void gfs2_log_incr_head(struct gfs2_sbd *sdp);
extern u64 gfs2_log_bmap(struct gfs2_jdesc *jd, unsigned int lbn);
Expand All @@ -29,18 +22,12 @@ extern int gfs2_find_jhead(struct gfs2_jdesc *jd,
struct gfs2_log_header_host *head, bool keep_cache);
static inline unsigned int buf_limit(struct gfs2_sbd *sdp)
{
unsigned int limit;

limit = (sdp->sd_sb.sb_bsize - BUF_OFFSET) / sizeof(__be64);
return limit;
return sdp->sd_ldptrs;
}

static inline unsigned int databuf_limit(struct gfs2_sbd *sdp)
{
unsigned int limit;

limit = (sdp->sd_sb.sb_bsize - DATABUF_OFFSET) / (2 * sizeof(__be64));
return limit;
return sdp->sd_ldptrs / 2;
}

static inline void lops_before_commit(struct gfs2_sbd *sdp,
Expand Down

0 comments on commit 458094c

Please sign in to comment.