Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c676f6d authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Macros removal in gfs2.h 



As suggested by Pekka Enberg <penberg@cs.helsinki.fi>.

The DIV_RU macro is renamed DIV_ROUND_UP and and moved to kernel.h
The other macros are gone from gfs2.h as (although not requested
by Pekka Enberg) are a number of included header file which are now
included individually. The inode number comparison function is
now an inline function.

The DT2IF and IF2DT may be addressed in a future patch.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent f3b270a4

fs/gfs2/acl.c

+6 −2
Original line number Diff line number Diff line
@@ -15,8 +15,11 @@ 
#include <linux/posix_acl.h>

#include <linux/posix_acl_xattr.h>

#include <asm/semaphore.h>

#include <linux/gfs2_ondisk.h>



#include "gfs2.h"

#include "lm_interface.h"

#include "incore.h"

#include "acl.h"

#include "eaops.h"

#include "eattr.h"
@@ -24,6 +27,7 @@ 
#include "inode.h"

#include "meta_io.h"

#include "trans.h"

#include "util.h"



#define ACL_ACCESS 1

#define ACL_DEFAULT 0
@@ -157,7 +161,7 @@ int gfs2_check_acl_locked(struct inode *inode, int mask) 
	struct posix_acl *acl = NULL;

	int error;



	error = acl_get(get_v2ip(inode), ACL_ACCESS, &acl, NULL, NULL, NULL);

	error = acl_get(inode->u.generic_ip, ACL_ACCESS, &acl, NULL, NULL, NULL);

	if (error)

		return error;
@@ -172,7 +176,7 @@ int gfs2_check_acl_locked(struct inode *inode, int mask) 


int gfs2_check_acl(struct inode *inode, int mask)

{

	struct gfs2_inode *ip = get_v2ip(inode);

	struct gfs2_inode *ip = inode->u.generic_ip;

	struct gfs2_holder i_gh;

	int error;

fs/gfs2/bits.c

+4 −0
Original line number Diff line number Diff line
@@ -21,10 +21,14 @@ 
#include <linux/spinlock.h>

#include <linux/completion.h>

#include <linux/buffer_head.h>

#include <linux/gfs2_ondisk.h>

#include <asm/semaphore.h>



#include "gfs2.h"

#include "lm_interface.h"

#include "incore.h"

#include "bits.h"

#include "util.h"



static const char valid_change[16] = {

	        /* current */

fs/gfs2/bmap.c

+7 −3
Original line number Diff line number Diff line
@@ -12,9 +12,12 @@ 
#include <linux/spinlock.h>

#include <linux/completion.h>

#include <linux/buffer_head.h>

#include <linux/gfs2_ondisk.h>

#include <asm/semaphore.h>



#include "gfs2.h"

#include "lm_interface.h"

#include "incore.h"

#include "bmap.h"

#include "glock.h"

#include "inode.h"
@@ -24,6 +27,7 @@ 
#include "rgrp.h"

#include "trans.h"

#include "dir.h"

#include "util.h"



/* This doesn't need to be that large as max 64 bit pointers in a 4k

 * block is 512, so __u16 is fine for that. It saves stack space to
@@ -660,7 +664,7 @@ static int do_strip(struct gfs2_inode *ip, struct buffer_head *dibh, 


	for (x = 0; x < rlist.rl_rgrps; x++) {

		struct gfs2_rgrpd *rgd;

		rgd = get_gl2rgd(rlist.rl_ghs[x].gh_gl);

		rgd = rlist.rl_ghs[x].gh_gl->gl_object;

		rg_blocks += rgd->rd_ri.ri_length;

	}
@@ -1021,7 +1025,7 @@ void gfs2_write_calc_reserv(struct gfs2_inode *ip, unsigned int len, 
	unsigned int tmp;



	if (gfs2_is_dir(ip)) {

		*data_blocks = DIV_RU(len, sdp->sd_jbsize) + 2;

		*data_blocks = DIV_ROUND_UP(len, sdp->sd_jbsize) + 2;

		*ind_blocks = 3 * (sdp->sd_max_jheight - 1);

	} else {

		*data_blocks = (len >> sdp->sd_sb.sb_bsize_shift) + 3;
@@ -1029,7 +1033,7 @@ void gfs2_write_calc_reserv(struct gfs2_inode *ip, unsigned int len, 
	}



	for (tmp = *data_blocks; tmp > sdp->sd_diptrs;) {

		tmp = DIV_RU(tmp, sdp->sd_inptrs);

		tmp = DIV_ROUND_UP(tmp, sdp->sd_inptrs);

		*ind_blocks += tmp;

	}

}

fs/gfs2/daemon.c

+4 −0
Original line number Diff line number Diff line
@@ -14,9 +14,12 @@ 
#include <linux/buffer_head.h>

#include <linux/kthread.h>

#include <linux/delay.h>

#include <linux/gfs2_ondisk.h>

#include <asm/semaphore.h>



#include "gfs2.h"

#include "lm_interface.h"

#include "incore.h"

#include "daemon.h"

#include "glock.h"

#include "log.h"
@@ -24,6 +27,7 @@ 
#include "recovery.h"

#include "super.h"

#include "unlinked.h"

#include "util.h"



/* This uses schedule_timeout() instead of msleep() because it's good for

   the daemons to wake up more often than the timeout when unmounting so

fs/gfs2/dir.c

+6 −2
Original line number Diff line number Diff line
@@ -59,9 +59,12 @@ 
#include <linux/completion.h>

#include <linux/buffer_head.h>

#include <linux/sort.h>

#include <linux/gfs2_ondisk.h>

#include <asm/semaphore.h>



#include "gfs2.h"

#include "lm_interface.h"

#include "incore.h"

#include "dir.h"

#include "glock.h"

#include "inode.h"
@@ -70,6 +73,7 @@ 
#include "rgrp.h"

#include "trans.h"

#include "bmap.h"

#include "util.h"



#define IS_LEAF     1 /* Hashed (leaf) directory */

#define IS_DINODE   2 /* Linear (stuffed dinode block) directory */
@@ -2196,7 +2200,7 @@ static int leaf_dealloc(struct gfs2_inode *dip, uint32_t index, uint32_t len, 


	for (x = 0; x < rlist.rl_rgrps; x++) {

		struct gfs2_rgrpd *rgd;

		rgd = get_gl2rgd(rlist.rl_ghs[x].gh_gl);

		rgd = rlist.rl_ghs[x].gh_gl->gl_object;

		rg_blocks += rgd->rd_ri.ri_length;

	}
@@ -2205,7 +2209,7 @@ static int leaf_dealloc(struct gfs2_inode *dip, uint32_t index, uint32_t len, 
		goto out_rlist;



	error = gfs2_trans_begin(sdp,

			rg_blocks + (DIV_RU(size, sdp->sd_jbsize) + 1) +

			rg_blocks + (DIV_ROUND_UP(size, sdp->sd_jbsize) + 1) +

			RES_DINODE + RES_STATFS + RES_QUOTA, l_blocks);

	if (error)

		goto out_rg_gunlock;