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

Commit 9ac1b4d9 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Move gfs2_recoverd into recovery.c 



By moving gfs2_recoverd, we can make an additional function static
and it also leaves only (the already scheduled for removal) gfs2_glockd
in daemon.c.

At the same time the declaration of gfs2_quotad is moved to quota.h
to reflect the new location of gfs2_quotad in a previous patch. Also
the recovery.h and quota.h headers are cleaned up.

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

fs/gfs2/daemon.c

+0 −22
Original line number Diff line number Diff line
@@ -59,25 +59,3 @@ int gfs2_glockd(void *data) 
	return 0;

}

/**

 * gfs2_recoverd - Recover dead machine's journals

 * @sdp: Pointer to GFS2 superblock

 *

 */



int gfs2_recoverd(void *data)

{

	struct gfs2_sbd *sdp = data;

	unsigned long t;



	while (!kthread_should_stop()) {

		gfs2_check_journals(sdp);

		t = gfs2_tune_get(sdp,  gt_recoverd_secs) * HZ;

		if (freezing(current))

			refrigerator();

		schedule_timeout_interruptible(t);

	}



	return 0;

}

fs/gfs2/daemon.h

+0 −2
Original line number Diff line number Diff line
@@ -11,7 +11,5 @@ 
#define __DAEMON_DOT_H__



int gfs2_glockd(void *data);

int gfs2_recoverd(void *data);

int gfs2_quotad(void *data);



#endif /* __DAEMON_DOT_H__ */

fs/gfs2/ops_fstype.c

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "sys.h"

#include "util.h"

#include "log.h"

#include "quota.h"



#define DO 0

#define UNDO 1

fs/gfs2/quota.h

+12 −11
Original line number Diff line number Diff line
@@ -15,21 +15,22 @@ struct gfs2_sbd; 


#define NO_QUOTA_CHANGE ((u32)-1)



int gfs2_quota_hold(struct gfs2_inode *ip, u32 uid, u32 gid);

void gfs2_quota_unhold(struct gfs2_inode *ip);

extern int gfs2_quota_hold(struct gfs2_inode *ip, u32 uid, u32 gid);

extern void gfs2_quota_unhold(struct gfs2_inode *ip);



int gfs2_quota_lock(struct gfs2_inode *ip, u32 uid, u32 gid);

void gfs2_quota_unlock(struct gfs2_inode *ip);

extern int gfs2_quota_lock(struct gfs2_inode *ip, u32 uid, u32 gid);

extern void gfs2_quota_unlock(struct gfs2_inode *ip);



int gfs2_quota_check(struct gfs2_inode *ip, u32 uid, u32 gid);

void gfs2_quota_change(struct gfs2_inode *ip, s64 change,

extern int gfs2_quota_check(struct gfs2_inode *ip, u32 uid, u32 gid);

extern void gfs2_quota_change(struct gfs2_inode *ip, s64 change,

			      u32 uid, u32 gid);



int gfs2_quota_sync(struct gfs2_sbd *sdp);

int gfs2_quota_refresh(struct gfs2_sbd *sdp, int user, u32 id);

extern int gfs2_quota_sync(struct gfs2_sbd *sdp);

extern int gfs2_quota_refresh(struct gfs2_sbd *sdp, int user, u32 id);



int gfs2_quota_init(struct gfs2_sbd *sdp);

void gfs2_quota_cleanup(struct gfs2_sbd *sdp);

extern int gfs2_quota_init(struct gfs2_sbd *sdp);

extern void gfs2_quota_cleanup(struct gfs2_sbd *sdp);

extern int gfs2_quotad(void *data);



static inline int gfs2_quota_lock_check(struct gfs2_inode *ip)

{

fs/gfs2/recovery.c

+25 −1
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#include <linux/gfs2_ondisk.h>

#include <linux/crc32.h>

#include <linux/lm_interface.h>

#include <linux/kthread.h>

#include <linux/freezer.h>



#include "gfs2.h"

#include "incore.h"
@@ -589,7 +591,7 @@ int gfs2_recover_journal(struct gfs2_jdesc *jd) 
 *

 */



void gfs2_check_journals(struct gfs2_sbd *sdp)

static void gfs2_check_journals(struct gfs2_sbd *sdp)

{

	struct gfs2_jdesc *jd;
@@ -603,3 +605,25 @@ void gfs2_check_journals(struct gfs2_sbd *sdp) 
	}

}



/**

 * gfs2_recoverd - Recover dead machine's journals

 * @sdp: Pointer to GFS2 superblock

 *

 */



int gfs2_recoverd(void *data)

{

	struct gfs2_sbd *sdp = data;

	unsigned long t;



	while (!kthread_should_stop()) {

		gfs2_check_journals(sdp);

		t = gfs2_tune_get(sdp,  gt_recoverd_secs) * HZ;

		if (freezing(current))

			refrigerator();

		schedule_timeout_interruptible(t);

	}



	return 0;

}