Commit 7bbbf2c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gfs2-4.21.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 

Pull gfs2 updates from Bob Peterson:

 - Enhancements and performance improvements to journal replay (Abhi
   Das)

 - Cleanup of gfs2_is_ordered and gfs2_is_writeback (Andreas
   Gruenbacher)

 - Fix a potential double-free in inode creation (Andreas Gruenbacher)

 - Fix the bitmap search loop that was searching too far (Andreas
   Gruenbacher)

 - Various cleanups (Andreas Gruenbacher, Bob Peterson)

 - Implement Steve Whitehouse's patch to dump nrpages for inodes (Bob
   Peterson)

 - Fix a withdraw bug where stuffed journaled data files didn't allocate
   enough journal space to be grown (Bob Peterson)

* tag 'gfs2-4.21.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: take jdata unstuff into account in do_grow
  gfs2: Dump nrpages for inodes and their glocks
  gfs2: Fix loop in gfs2_rbm_find
  gfs2: Get rid of potential double-freeing in gfs2_create_inode
  gfs2: Remove vestigial bd_ops
  gfs2: read journal in large chunks to locate the head
  gfs2: add a helper function to get_log_header that can be used elsewhere
  gfs2: changes to gfs2_log_XXX_bio
  gfs2: add more timing info to journal recovery process
  gfs2: Fix the gfs2_invalidatepage description
  gfs2: Clean up gfs2_is_{ordered,writeback}
parents b71acb0e bc020561

fs/gfs2/aops.c

+8 −8
Original line number Diff line number Diff line
@@ -820,10 +820,10 @@ out: 
 * @page: the page that's being released

 * @gfp_mask: passed from Linux VFS, ignored by us

 *

 * Call try_to_free_buffers() if the buffers in this page can be

 * released.

 * Calls try_to_free_buffers() to free the buffers and put the page if the

 * buffers can be released.

 *

 * Returns: 0

 * Returns: 1 if the page was put or else 0

 */



int gfs2_releasepage(struct page *page, gfp_t gfp_mask)
@@ -930,14 +930,14 @@ static const struct address_space_operations gfs2_jdata_aops = { 
void gfs2_set_aops(struct inode *inode)

{

	struct gfs2_inode *ip = GFS2_I(inode);

	struct gfs2_sbd *sdp = GFS2_SB(inode);



	if (gfs2_is_writeback(ip))

	if (gfs2_is_jdata(ip))

		inode->i_mapping->a_ops = &gfs2_jdata_aops;

	else if (gfs2_is_writeback(sdp))

		inode->i_mapping->a_ops = &gfs2_writeback_aops;

	else if (gfs2_is_ordered(ip))

	else if (gfs2_is_ordered(sdp))

		inode->i_mapping->a_ops = &gfs2_ordered_aops;

	else if (gfs2_is_jdata(ip))

		inode->i_mapping->a_ops = &gfs2_jdata_aops;

	else

		BUG();

}

fs/gfs2/bmap.c

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

#include <linux/crc32.h>

#include <linux/iomap.h>

#include <linux/ktime.h>



#include "gfs2.h"

#include "incore.h"
@@ -2083,6 +2084,8 @@ static int do_grow(struct inode *inode, u64 size) 
	}



	error = gfs2_trans_begin(sdp, RES_DINODE + RES_STATFS + RES_RG_BIT +

				 (unstuff &&

				  gfs2_is_jdata(ip) ? RES_JDATA : 0) +

				 (sdp->sd_args.ar_quota == GFS2_QUOTA_OFF ?

				  0 : RES_QUOTA), 0);

	if (error)
@@ -2248,7 +2251,9 @@ int gfs2_map_journal_extents(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd) 
	unsigned int shift = sdp->sd_sb.sb_bsize_shift;

	u64 size;

	int rc;

	ktime_t start, end;



	start = ktime_get();

	lblock_stop = i_size_read(jd->jd_inode) >> shift;

	size = (lblock_stop - lblock) << shift;

	jd->nr_extents = 0;
@@ -2268,8 +2273,9 @@ int gfs2_map_journal_extents(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd) 
		lblock += (bh.b_size >> ip->i_inode.i_blkbits);

	} while(size > 0);



	fs_info(sdp, "journal %d mapped with %u extents\n", jd->jd_jid,

		jd->nr_extents);

	end = ktime_get();

	fs_info(sdp, "journal %d mapped with %u extents in %lldms\n", jd->jd_jid,

		jd->nr_extents, ktime_ms_delta(end, start));

	return 0;



fail:

fs/gfs2/glock.c

+1 −1
Original line number Diff line number Diff line
@@ -1777,7 +1777,7 @@ static const char *gflags2str(char *buf, const struct gfs2_glock *gl) 
 *

 */



void gfs2_dump_glock(struct seq_file *seq, const struct gfs2_glock *gl)

void gfs2_dump_glock(struct seq_file *seq, struct gfs2_glock *gl)

{

	const struct gfs2_glock_operations *glops = gl->gl_ops;

	unsigned long long dtime;

fs/gfs2/glock.h

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ extern int gfs2_glock_nq_num(struct gfs2_sbd *sdp, u64 number, 
			     struct gfs2_holder *gh);

extern int gfs2_glock_nq_m(unsigned int num_gh, struct gfs2_holder *ghs);

extern void gfs2_glock_dq_m(unsigned int num_gh, struct gfs2_holder *ghs);

extern void gfs2_dump_glock(struct seq_file *seq, const struct gfs2_glock *gl);

extern void gfs2_dump_glock(struct seq_file *seq, struct gfs2_glock *gl);

#define GLOCK_BUG_ON(gl,x) do { if (unlikely(x)) { gfs2_dump_glock(NULL, gl); BUG(); } } while(0)

extern __printf(2, 3)

void gfs2_print_dbg(struct seq_file *seq, const char *fmt, ...);

fs/gfs2/glops.c

+13 −4
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "util.h"

#include "trans.h"

#include "dir.h"

#include "lops.h"



struct workqueue_struct *gfs2_freeze_wq;
@@ -466,17 +467,25 @@ static int inode_go_lock(struct gfs2_holder *gh) 
 *

 */



static void inode_go_dump(struct seq_file *seq, const struct gfs2_glock *gl)

static void inode_go_dump(struct seq_file *seq, struct gfs2_glock *gl)

{

	const struct gfs2_inode *ip = gl->gl_object;

	struct gfs2_inode *ip = gl->gl_object;

	struct inode *inode = &ip->i_inode;

	unsigned long nrpages;



	if (ip == NULL)

		return;

	gfs2_print_dbg(seq, " I: n:%llu/%llu t:%u f:0x%02lx d:0x%08x s:%llu\n",



	xa_lock_irq(&inode->i_data.i_pages);

	nrpages = inode->i_data.nrpages;

	xa_unlock_irq(&inode->i_data.i_pages);



	gfs2_print_dbg(seq, " I: n:%llu/%llu t:%u f:0x%02lx d:0x%08x s:%llu p:%lu\n",

		  (unsigned long long)ip->i_no_formal_ino,

		  (unsigned long long)ip->i_no_addr,

		  IF2DT(ip->i_inode.i_mode), ip->i_flags,

		  (unsigned int)ip->i_diskflags,

		  (unsigned long long)i_size_read(&ip->i_inode));

		  (unsigned long long)i_size_read(inode), nrpages);

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE