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: Andreas Gruenbacher <agruenba@redhat.com>

diff --git a/fs/gfs2/lops.h b/fs/gfs2/lops.h
index fbdbb08dcec6af19057a4f4181e10f2441295c11..3fca5bf239d336d8b308e74c91f6a1429a836773 100644 (file)
--- a/fs/gfs2/lops.h
+++ b/fs/gfs2/lops.h
@@ -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);
@@ -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,