Commit f2c80837 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gfs2-for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 

Pull gfs2 updates from Andreas Gruenbacher:

 - Fix some compiler and kernel-doc warnings

 - Various minor cleanups and optimizations

 - Add a new sysfs gfs2 status file with some filesystem wide
   information

* tag 'gfs2-for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: Fix fall-through warnings for Clang
  gfs2: Fix a number of kernel-doc warnings
  gfs2: Make gfs2_setattr_simple static
  gfs2: Add new sysfs file for gfs2 status
  gfs2: Silence possible null pointer dereference warning
  gfs2: Turn gfs2_meta_indirect_buffer into gfs2_meta_buffer
  gfs2: Replace gfs2_lblk_to_dblk with gfs2_get_extent
  gfs2: Turn gfs2_extent_map into gfs2_{get,alloc}_extent
  gfs2: Add new gfs2_iomap_get helper
  gfs2: Remove unused variable sb_format
  gfs2: Fix dir.c function parameter descriptions
  gfs2: Eliminate gh parameter from go_xmote_bh func
  gfs2: don't create empty buffers for NO_CREATE
parents 8ae8932c e5966cf2

fs/gfs2/aops.c

+1 −4
Original line number Diff line number Diff line
@@ -540,10 +540,7 @@ int gfs2_internal_read(struct gfs2_inode *ip, char *buf, loff_t *pos, 


/**

 * gfs2_readahead - Read a bunch of pages at once

 * @file: The file to read from

 * @mapping: Address space info

 * @pages: List of pages to read

 * @nr_pages: Number of pages to read

 * @rac: Read-ahead control structure

 *

 * Some notes:

 * 1. This is only for readahead, so we can simply ignore any things

fs/gfs2/bmap.c

+78 −75
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static int __fillup_metapath(struct gfs2_inode *ip, struct metapath *mp, 


		if (!dblock)

			break;

		ret = gfs2_meta_indirect_buffer(ip, x + 1, dblock, &mp->mp_bh[x + 1]);

		ret = gfs2_meta_buffer(ip, GFS2_METATYPE_IN, dblock, &mp->mp_bh[x + 1]);

		if (ret)

			return ret;

	}
@@ -632,7 +632,7 @@ enum alloc_state { 
};



/**

 * gfs2_iomap_alloc - Build a metadata tree of the requested height

 * __gfs2_iomap_alloc - Build a metadata tree of the requested height

 * @inode: The GFS2 inode

 * @iomap: The iomap structure

 * @mp: The metapath, with proper height information calculated
@@ -642,7 +642,7 @@ enum alloc_state { 
 *  ii) Indirect blocks to fill in lower part of the metadata tree

 * iii) Data blocks

 *

 * This function is called after gfs2_iomap_get, which works out the

 * This function is called after __gfs2_iomap_get, which works out the

 * total number of blocks which we need via gfs2_alloc_size.

 *

 * We then do the actual allocation asking for an extent at a time (if
@@ -660,7 +660,7 @@ enum alloc_state { 
 * Returns: errno on error

 */



static int gfs2_iomap_alloc(struct inode *inode, struct iomap *iomap,

static int __gfs2_iomap_alloc(struct inode *inode, struct iomap *iomap,

			      struct metapath *mp)

{

	struct gfs2_inode *ip = GFS2_I(inode);
@@ -802,10 +802,10 @@ static u64 gfs2_alloc_size(struct inode *inode, struct metapath *mp, u64 size) 


	/*

	 * For writes to stuffed files, this function is called twice via

	 * gfs2_iomap_get, before and after unstuffing. The size we return the

	 * __gfs2_iomap_get, before and after unstuffing. The size we return the

	 * first time needs to be large enough to get the reservation and

	 * allocation sizes right.  The size we return the second time must

	 * be exact or else gfs2_iomap_alloc won't do the right thing.

	 * be exact or else __gfs2_iomap_alloc won't do the right thing.

	 */



	if (gfs2_is_stuffed(ip) || mp->mp_fheight != mp->mp_aheight) {
@@ -829,7 +829,7 @@ static u64 gfs2_alloc_size(struct inode *inode, struct metapath *mp, u64 size) 
}



/**

 * gfs2_iomap_get - Map blocks from an inode to disk blocks

 * __gfs2_iomap_get - Map blocks from an inode to disk blocks

 * @inode: The inode

 * @pos: Starting position in bytes

 * @length: Length to map, in bytes
@@ -839,7 +839,7 @@ static u64 gfs2_alloc_size(struct inode *inode, struct metapath *mp, u64 size) 
 *

 * Returns: errno

 */

static int gfs2_iomap_get(struct inode *inode, loff_t pos, loff_t length,

static int __gfs2_iomap_get(struct inode *inode, loff_t pos, loff_t length,

			    unsigned flags, struct iomap *iomap,

			    struct metapath *mp)

{
@@ -961,32 +961,6 @@ static int gfs2_iomap_get(struct inode *inode, loff_t pos, loff_t length, 
	goto out;

}



/**

 * gfs2_lblk_to_dblk - convert logical block to disk block

 * @inode: the inode of the file we're mapping

 * @lblock: the block relative to the start of the file

 * @dblock: the returned dblock, if no error

 *

 * This function maps a single block from a file logical block (relative to

 * the start of the file) to a file system absolute block using iomap.

 *

 * Returns: the absolute file system block, or an error

 */

int gfs2_lblk_to_dblk(struct inode *inode, u32 lblock, u64 *dblock)

{

	struct iomap iomap = { };

	struct metapath mp = { .mp_aheight = 1, };

	loff_t pos = (loff_t)lblock << inode->i_blkbits;

	int ret;



	ret = gfs2_iomap_get(inode, pos, i_blocksize(inode), 0, &iomap, &mp);

	release_metapath(&mp);

	if (ret == 0)

		*dblock = iomap.addr >> inode->i_blkbits;



	return ret;

}



static int gfs2_write_lock(struct inode *inode)

{

	struct gfs2_inode *ip = GFS2_I(inode);
@@ -1109,14 +1083,14 @@ static int gfs2_iomap_begin_write(struct inode *inode, loff_t pos, 
			if (ret)

				goto out_trans_end;

			release_metapath(mp);

			ret = gfs2_iomap_get(inode, iomap->offset,

			ret = __gfs2_iomap_get(inode, iomap->offset,

					       iomap->length, flags, iomap, mp);

			if (ret)

				goto out_trans_end;

		}



		if (iomap->type == IOMAP_HOLE) {

			ret = gfs2_iomap_alloc(inode, iomap, mp);

			ret = __gfs2_iomap_alloc(inode, iomap, mp);

			if (ret) {

				gfs2_trans_end(sdp);

				gfs2_inplace_release(ip);
@@ -1168,7 +1142,7 @@ static int gfs2_iomap_begin(struct inode *inode, loff_t pos, loff_t length, 
			goto out;

	}



	ret = gfs2_iomap_get(inode, pos, length, flags, iomap, &mp);

	ret = __gfs2_iomap_get(inode, pos, length, flags, iomap, &mp);

	if (ret)

		goto out_unlock;
@@ -1290,9 +1264,7 @@ int gfs2_block_map(struct inode *inode, sector_t lblock, 
	struct gfs2_inode *ip = GFS2_I(inode);

	loff_t pos = (loff_t)lblock << inode->i_blkbits;

	loff_t length = bh_map->b_size;

	struct metapath mp = { .mp_aheight = 1, };

	struct iomap iomap = { };

	int flags = create ? IOMAP_WRITE : 0;

	int ret;



	clear_buffer_mapped(bh_map);
@@ -1300,10 +1272,10 @@ int gfs2_block_map(struct inode *inode, sector_t lblock, 
	clear_buffer_boundary(bh_map);

	trace_gfs2_bmap(ip, bh_map, lblock, create, 1);



	ret = gfs2_iomap_get(inode, pos, length, flags, &iomap, &mp);

	if (create && !ret && iomap.type == IOMAP_HOLE)

		ret = gfs2_iomap_alloc(inode, &iomap, &mp);

	release_metapath(&mp);

	if (!create)

		ret = gfs2_iomap_get(inode, pos, length, &iomap);

	else

		ret = gfs2_iomap_alloc(inode, pos, length, &iomap);

	if (ret)

		goto out;
@@ -1324,28 +1296,47 @@ int gfs2_block_map(struct inode *inode, sector_t lblock, 
	return ret;

}



/*

 * Deprecated: do not use in new code

 */

int gfs2_extent_map(struct inode *inode, u64 lblock, int *new, u64 *dblock, unsigned *extlen)

int gfs2_get_extent(struct inode *inode, u64 lblock, u64 *dblock,

		    unsigned int *extlen)

{

	struct buffer_head bh = { .b_state = 0, .b_blocknr = 0 };

	unsigned int blkbits = inode->i_blkbits;

	struct iomap iomap = { };

	unsigned int len;

	int ret;

	int create = *new;



	BUG_ON(!extlen);

	BUG_ON(!dblock);

	BUG_ON(!new);



	bh.b_size = BIT(inode->i_blkbits + (create ? 0 : 5));

	ret = gfs2_block_map(inode, lblock, &bh, create);

	*extlen = bh.b_size >> inode->i_blkbits;

	*dblock = bh.b_blocknr;

	if (buffer_new(&bh))

		*new = 1;

	else

		*new = 0;



	ret = gfs2_iomap_get(inode, lblock << blkbits, *extlen << blkbits,

			     &iomap);

	if (ret)

		return ret;

	if (iomap.type != IOMAP_MAPPED)

		return -EIO;

	*dblock = iomap.addr >> blkbits;

	len = iomap.length >> blkbits;

	if (len < *extlen)

		*extlen = len;

	return 0;

}



int gfs2_alloc_extent(struct inode *inode, u64 lblock, u64 *dblock,

		      unsigned int *extlen, bool *new)

{

	unsigned int blkbits = inode->i_blkbits;

	struct iomap iomap = { };

	unsigned int len;

	int ret;



	ret = gfs2_iomap_alloc(inode, lblock << blkbits, *extlen << blkbits,

			       &iomap);

	if (ret)

		return ret;

	if (iomap.type != IOMAP_MAPPED)

		return -EIO;

	*dblock = iomap.addr >> blkbits;

	len = iomap.length >> blkbits;

	if (len < *extlen)

		*extlen = len;

	*new = iomap.flags & IOMAP_F_NEW;

	return 0;

}



/*
@@ -1461,15 +1452,26 @@ static int trunc_start(struct inode *inode, u64 newsize) 
	return error;

}



int gfs2_iomap_get_alloc(struct inode *inode, loff_t pos, loff_t length,

int gfs2_iomap_get(struct inode *inode, loff_t pos, loff_t length,

		   struct iomap *iomap)

{

	struct metapath mp = { .mp_aheight = 1, };

	int ret;



	ret = gfs2_iomap_get(inode, pos, length, IOMAP_WRITE, iomap, &mp);

	ret = __gfs2_iomap_get(inode, pos, length, 0, iomap, &mp);

	release_metapath(&mp);

	return ret;

}



int gfs2_iomap_alloc(struct inode *inode, loff_t pos, loff_t length,

		     struct iomap *iomap)

{

	struct metapath mp = { .mp_aheight = 1, };

	int ret;



	ret = __gfs2_iomap_get(inode, pos, length, IOMAP_WRITE, iomap, &mp);

	if (!ret && iomap->type == IOMAP_HOLE)

		ret = gfs2_iomap_alloc(inode, iomap, &mp);

		ret = __gfs2_iomap_alloc(inode, iomap, &mp);

	release_metapath(&mp);

	return ret;

}
@@ -1477,7 +1479,7 @@ int gfs2_iomap_get_alloc(struct inode *inode, loff_t pos, loff_t length, 
/**

 * sweep_bh_for_rgrps - find an rgrp in a meta buffer and free blocks therein

 * @ip: inode

 * @rg_gh: holder of resource group glock

 * @rd_gh: holder of resource group glock

 * @bh: buffer head to sweep

 * @start: starting point in bh

 * @end: end point in bh
@@ -1658,8 +1660,11 @@ static bool mp_eq_to_hgt(struct metapath *mp, __u16 *list, unsigned int h) 


/**

 * find_nonnull_ptr - find a non-null pointer given a metapath and height

 * @sdp: The superblock

 * @mp: starting metapath

 * @h: desired height to search

 * @end_list: See punch_hole().

 * @end_aligned: See punch_hole().

 *

 * Assumes the metapath is valid (with buffers) out to height h.

 * Returns: true if a non-null pointer was found in the metapath buffer
@@ -2519,7 +2524,6 @@ int __gfs2_punch_hole(struct file *file, loff_t offset, loff_t length) 
static int gfs2_map_blocks(struct iomap_writepage_ctx *wpc, struct inode *inode,

		loff_t offset)

{

	struct metapath mp = { .mp_aheight = 1, };

	int ret;



	if (WARN_ON_ONCE(gfs2_is_stuffed(GFS2_I(inode))))
@@ -2530,8 +2534,7 @@ static int gfs2_map_blocks(struct iomap_writepage_ctx *wpc, struct inode *inode, 
		return 0;



	memset(&wpc->iomap, 0, sizeof(wpc->iomap));

	ret = gfs2_iomap_get(inode, offset, INT_MAX, 0, &wpc->iomap, &mp);

	release_metapath(&mp);

	ret = gfs2_iomap_get(inode, offset, INT_MAX, &wpc->iomap);

	return ret;

}

fs/gfs2/bmap.h

+8 −5
Original line number Diff line number Diff line
@@ -49,10 +49,14 @@ extern const struct iomap_writeback_ops gfs2_writeback_ops; 
extern int gfs2_unstuff_dinode(struct gfs2_inode *ip, struct page *page);

extern int gfs2_block_map(struct inode *inode, sector_t lblock,

			  struct buffer_head *bh, int create);

extern int gfs2_iomap_get_alloc(struct inode *inode, loff_t pos, loff_t length,

extern int gfs2_iomap_get(struct inode *inode, loff_t pos, loff_t length,

			  struct iomap *iomap);

extern int gfs2_extent_map(struct inode *inode, u64 lblock, int *new,

			   u64 *dblock, unsigned *extlen);

extern int gfs2_iomap_alloc(struct inode *inode, loff_t pos, loff_t length,

			    struct iomap *iomap);

extern int gfs2_get_extent(struct inode *inode, u64 lblock, u64 *dblock,

			   unsigned int *extlen);

extern int gfs2_alloc_extent(struct inode *inode, u64 lblock, u64 *dblock,

			     unsigned *extlen, bool *new);

extern int gfs2_setattr_size(struct inode *inode, u64 size);

extern void gfs2_trim_blocks(struct inode *inode);

extern int gfs2_truncatei_resume(struct gfs2_inode *ip);
@@ -62,6 +66,5 @@ extern int gfs2_write_alloc_required(struct gfs2_inode *ip, u64 offset, 
extern int gfs2_map_journal_extents(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd);

extern void gfs2_free_journal_extents(struct gfs2_jdesc *jd);

extern int __gfs2_punch_hole(struct file *file, loff_t offset, loff_t length);

extern int gfs2_lblk_to_dblk(struct inode *inode, u32 lblock, u64 *dblock);



#endif /* __BMAP_DOT_H__ */

fs/gfs2/dir.c

+28 −24
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static int gfs2_dir_write_data(struct gfs2_inode *ip, const char *buf, 
	unsigned int o;

	int copied = 0;

	int error = 0;

	int new = 0;

	bool new = false;



	if (!size)

		return 0;
@@ -189,9 +189,9 @@ static int gfs2_dir_write_data(struct gfs2_inode *ip, const char *buf, 
			amount = sdp->sd_sb.sb_bsize - o;



		if (!extlen) {

			new = 1;

			error = gfs2_extent_map(&ip->i_inode, lblock, &new,

						&dblock, &extlen);

			extlen = 1;

			error = gfs2_alloc_extent(&ip->i_inode, lblock, &dblock,

						  &extlen, &new);

			if (error)

				goto fail;

			error = -EIO;
@@ -286,15 +286,14 @@ static int gfs2_dir_read_data(struct gfs2_inode *ip, __be64 *buf, 
	while (copied < size) {

		unsigned int amount;

		struct buffer_head *bh;

		int new;



		amount = size - copied;

		if (amount > sdp->sd_sb.sb_bsize - o)

			amount = sdp->sd_sb.sb_bsize - o;



		if (!extlen) {

			new = 0;

			error = gfs2_extent_map(&ip->i_inode, lblock, &new,

			extlen = 32;

			error = gfs2_get_extent(&ip->i_inode, lblock,

						&dblock, &extlen);

			if (error || !dblock)

				goto fail;
@@ -770,14 +769,13 @@ static int get_leaf(struct gfs2_inode *dip, u64 leaf_no, 
/**

 * get_leaf_nr - Get a leaf number associated with the index

 * @dip: The GFS2 inode

 * @index:

 * @leaf_out:

 * @index: hash table index of the targeted leaf

 * @leaf_out: Resulting leaf block number

 *

 * Returns: 0 on success, error code otherwise

 */



static int get_leaf_nr(struct gfs2_inode *dip, u32 index,

		       u64 *leaf_out)

static int get_leaf_nr(struct gfs2_inode *dip, u32 index, u64 *leaf_out)

{

	__be64 *hash;

	int error;
@@ -898,7 +896,7 @@ static struct gfs2_leaf *new_leaf(struct inode *inode, struct buffer_head **pbh, 


/**

 * dir_make_exhash - Convert a stuffed directory into an ExHash directory

 * @dip: The GFS2 inode

 * @inode: The directory inode to be converted to exhash

 *

 * Returns: 0 on success, error code otherwise

 */
@@ -991,9 +989,8 @@ static int dir_make_exhash(struct inode *inode) 


/**

 * dir_split_leaf - Split a leaf block into two

 * @dip: The GFS2 inode

 * @index:

 * @leaf_no:

 * @inode: The directory inode to be split

 * @name: name of the dirent we're trying to insert

 *

 * Returns: 0 on success, error code on failure

 */
@@ -1252,6 +1249,7 @@ static int compare_dents(const void *a, const void *b) 
 * @ctx: what to feed the entries to

 * @darr: an array of struct gfs2_dirent pointers to read

 * @entries: the number of entries in darr

 * @sort_start: index of the directory array to start our sort

 * @copied: pointer to int that's non-zero if a entry has been copied out

 *

 * Jump through some hoops to make sure that if there are hash collsions,
@@ -1468,6 +1466,10 @@ static int gfs2_dir_read_leaf(struct inode *inode, struct dir_context *ctx, 


/**

 * gfs2_dir_readahead - Issue read-ahead requests for leaf blocks.

 * @inode: the directory inode

 * @hsize: hash table size

 * @index: index into the hash table

 * @f_ra: read-ahead parameters

 *

 * Note: we can't calculate each index like dir_e_read can because we don't

 * have the leaf, and therefore we don't have the depth, and therefore we
@@ -1517,8 +1519,9 @@ static void gfs2_dir_readahead(struct inode *inode, unsigned hsize, u32 index, 


/**

 * dir_e_read - Reads the entries from a directory into a filldir buffer

 * @dip: dinode pointer

 * @inode: the directory inode

 * @ctx: actor to feed the entries to

 * @f_ra: read-ahead parameters

 *

 * Returns: errno

 */
@@ -1627,7 +1630,7 @@ int gfs2_dir_read(struct inode *inode, struct dir_context *ctx, 


/**

 * gfs2_dir_search - Search a directory

 * @dip: The GFS2 dir inode

 * @dir: The GFS2 directory inode

 * @name: The name we are looking up

 * @fail_on_exist: Fail if the name exists rather than looking it up

 *
@@ -1864,7 +1867,7 @@ int gfs2_dir_add(struct inode *inode, const struct qstr *name, 
/**

 * gfs2_dir_del - Delete a directory entry

 * @dip: The GFS2 inode

 * @filename: The filename

 * @dentry: The directory entry we want to delete

 *

 * Returns: 0 on success, error code on failure

 */
@@ -1918,9 +1921,10 @@ int gfs2_dir_del(struct gfs2_inode *dip, const struct dentry *dentry) 


/**

 * gfs2_dir_mvino - Change inode number of directory entry

 * @dip: The GFS2 inode

 * @filename:

 * @new_inode:

 * @dip: The GFS2 directory inode

 * @filename: the filename to be moved

 * @nip: the new GFS2 inode

 * @new_type: the de_type of the new dirent

 *

 * This routine changes the inode number of a directory entry.  It's used

 * by rename to change ".." when a directory is moved.
@@ -1960,7 +1964,7 @@ int gfs2_dir_mvino(struct gfs2_inode *dip, const struct qstr *filename, 
 * @len: the number of pointers to this leaf

 * @leaf_no: the leaf number

 * @leaf_bh: buffer_head for the starting leaf

 * last_dealloc: 1 if this is the final dealloc for the leaf, else 0

 * @last_dealloc: 1 if this is the final dealloc for the leaf, else 0

 *

 * Returns: errno

 */
@@ -2142,8 +2146,8 @@ int gfs2_dir_exhash_dealloc(struct gfs2_inode *dip) 


/**

 * gfs2_diradd_alloc_required - find if adding entry will require an allocation

 * @ip: the file being written to

 * @filname: the filename that's going to be added

 * @inode: the directory inode being written to

 * @name: the filename that's going to be added

 * @da: The structure to return dir alloc info

 *

 * Returns: 0 if ok, -ve on error

fs/gfs2/file.c

+5 −7
Original line number Diff line number Diff line
@@ -119,8 +119,8 @@ static int gfs2_readdir(struct file *file, struct dir_context *ctx) 
	return error;

}



/**

 * fsflag_gfs2flag

/*

 * struct fsflag_gfs2flag

 *

 * The FS_JOURNAL_DATA_FL flag maps to GFS2_DIF_INHERIT_JDATA for directories,

 * and to GFS2_DIF_JDATA for non-directories.
@@ -398,7 +398,7 @@ static int gfs2_allocate_page_backing(struct page *page, unsigned int length) 
	do {

		struct iomap iomap = { };



		if (gfs2_iomap_get_alloc(page->mapping->host, pos, length, &iomap))

		if (gfs2_iomap_alloc(page->mapping->host, pos, length, &iomap))

			return -EIO;



		if (length < iomap.length)
@@ -412,7 +412,6 @@ static int gfs2_allocate_page_backing(struct page *page, unsigned int length) 


/**

 * gfs2_page_mkwrite - Make a shared, mmap()ed, page writable

 * @vma: The virtual memory area

 * @vmf: The virtual memory fault containing the page to become writable

 *

 * When the page becomes writable, we need to ensure that we have
@@ -563,7 +562,7 @@ static const struct vm_operations_struct gfs2_vm_ops = { 
};



/**

 * gfs2_mmap -

 * gfs2_mmap

 * @file: The file to map

 * @vma: The VMA which described the mapping

 *
@@ -968,8 +967,7 @@ static int fallocate_chunk(struct inode *inode, loff_t offset, loff_t len, 
	while (offset < end) {

		struct iomap iomap = { };



		error = gfs2_iomap_get_alloc(inode, offset, end - offset,

					     &iomap);

		error = gfs2_iomap_alloc(inode, offset, end - offset, &iomap);

		if (error)

			goto out;

		offset = iomap.offset + iomap.length;