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

Commit 546fac60 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gfs2-merge-window' of git://git.kernel.org:/pub/scm/linux/kernel/git/gfs2/linux-gfs2 

Pull GFS2 updates from Bob Peterson:
 "Here are the patches we've accumulated for GFS2 for the current
  upstream merge window.  We have a good mixture this time.  Here are
  some of the features:

   - Fix a problem with RO mounts writing to the journal.

   - Further improvements to quotas on GFS2.

   - Added support for rename2 and RENAME_EXCHANGE on GFS2.

   - Increase performance by making glock lru_list less of a bottleneck.

   - Increase performance by avoiding unnecessary buffer_head releases.

   - Increase performance by using average glock round trip time from all CPUs.

   - Fixes for some compiler warnings and minor white space issues.

   - Other misc bug fixes"

* tag 'gfs2-merge-window' of git://git.kernel.org:/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  GFS2: Don't brelse rgrp buffer_heads every allocation
  GFS2: Don't add all glocks to the lru
  gfs2: Don't support fallocate on jdata	files
  gfs2: s64 cast for negative quota value
  gfs2: limit quota log messages
  gfs2: fix quota updates on block boundaries
  gfs2: fix shadow warning in gfs2_rbm_find()
  gfs2: kerneldoc warning fixes
  gfs2: convert simple_str to kstr
  GFS2: make sure S_NOSEC flag isn't overwritten
  GFS2: add support for rename2 and RENAME_EXCHANGE
  gfs2: handle NULL rgd in set_rgrp_preferences
  GFS2: inode.c: indent with TABs, not spaces
  GFS2: mark the journal idle to fix ro mounts
  GFS2: Average in only non-zero round-trip times for congestion stats
  GFS2: Use average srttb value in congestion calculations
parents ebeaa8dd 39b0f1e9

fs/gfs2/aops.c

+8 −4
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ static int __gfs2_jdata_writepage(struct page *page, struct writeback_control *w 
/**

 * gfs2_jdata_writepage - Write complete page

 * @page: Page to write

 * @wbc: The writeback control

 *

 * Returns: errno

 *
@@ -221,9 +222,10 @@ static int gfs2_writepages(struct address_space *mapping, 
 * gfs2_write_jdata_pagevec - Write back a pagevec's worth of pages

 * @mapping: The mapping

 * @wbc: The writeback control

 * @writepage: The writepage function to call for each page

 * @pvec: The vector of pages

 * @nr_pages: The number of pages to write

 * @end: End position

 * @done_index: Page index

 *

 * Returns: non-zero if loop should terminate, zero otherwise

 */
@@ -333,8 +335,6 @@ static int gfs2_write_jdata_pagevec(struct address_space *mapping, 
 * gfs2_write_cache_jdata - Like write_cache_pages but different

 * @mapping: The mapping to write

 * @wbc: The writeback control

 * @writepage: The writepage function to call

 * @data: The data to pass to writepage

 *

 * The reason that we use our own function here is that we need to

 * start transactions before we grab page locks. This allows us
@@ -588,6 +588,10 @@ int gfs2_internal_read(struct gfs2_inode *ip, char *buf, loff_t *pos, 


/**

 * gfs2_readpages - 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

 *

 * Some notes:

 * 1. This is only for readahead, so we can simply ignore any things
@@ -853,7 +857,7 @@ static int gfs2_stuffed_write_end(struct inode *inode, struct buffer_head *dibh, 
 * @mapping: The address space to write to

 * @pos: The file position

 * @len: The length of the data

 * @copied:

 * @copied: How much was actually copied by the VFS

 * @page: The page that has been written

 * @fsdata: The fsdata (unused in GFS2)

 *

fs/gfs2/file.c

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ void gfs2_set_inode_flags(struct inode *inode) 


	flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_NOSEC);

	if ((ip->i_eattr == 0) && !is_sxid(inode->i_mode))

		inode->i_flags |= S_NOSEC;

		flags |= S_NOSEC;

	if (ip->i_diskflags & GFS2_DIF_IMMUTABLE)

		flags |= S_IMMUTABLE;

	if (ip->i_diskflags & GFS2_DIF_APPENDONLY)
@@ -917,7 +917,7 @@ static long gfs2_fallocate(struct file *file, int mode, loff_t offset, loff_t le 
	struct gfs2_holder gh;

	int ret;



	if (mode & ~FALLOC_FL_KEEP_SIZE)

	if ((mode & ~FALLOC_FL_KEEP_SIZE) || gfs2_is_jdata(ip))

		return -EOPNOTSUPP;



	mutex_lock(&inode->i_mutex);

fs/gfs2/glock.c

+2 −1
Original line number Diff line number Diff line
@@ -1076,7 +1076,8 @@ void gfs2_glock_dq(struct gfs2_holder *gh) 
		    !test_bit(GLF_DEMOTE, &gl->gl_flags))

			fast_path = 1;

	}

	if (!test_bit(GLF_LFLUSH, &gl->gl_flags) && demote_ok(gl))

	if (!test_bit(GLF_LFLUSH, &gl->gl_flags) && demote_ok(gl) &&

	    (glops->go_flags & GLOF_LRU))

		gfs2_glock_add_to_lru(gl);



	trace_gfs2_glock_queue(gh, 0);

fs/gfs2/glops.c

+15 −5
Original line number Diff line number Diff line
@@ -144,6 +144,12 @@ static void rgrp_go_sync(struct gfs2_glock *gl) 
	struct gfs2_rgrpd *rgd;

	int error;



	spin_lock(&gl->gl_spin);

	rgd = gl->gl_object;

	if (rgd)

		gfs2_rgrp_brelse(rgd);

	spin_unlock(&gl->gl_spin);



	if (!test_and_clear_bit(GLF_DIRTY, &gl->gl_flags))

		return;

	GLOCK_BUG_ON(gl, gl->gl_state != LM_ST_EXCLUSIVE);
@@ -175,16 +181,18 @@ static void rgrp_go_inval(struct gfs2_glock *gl, int flags) 
{

	struct gfs2_sbd *sdp = gl->gl_sbd;

	struct address_space *mapping = &sdp->sd_aspace;

	struct gfs2_rgrpd *rgd = gl->gl_object;



	if (rgd)

		gfs2_rgrp_brelse(rgd);



	WARN_ON_ONCE(!(flags & DIO_METADATA));

	gfs2_assert_withdraw(sdp, !atomic_read(&gl->gl_ail_count));

	truncate_inode_pages_range(mapping, gl->gl_vm.start, gl->gl_vm.end);



	if (gl->gl_object) {

		struct gfs2_rgrpd *rgd = (struct gfs2_rgrpd *)gl->gl_object;

	if (rgd)

		rgd->rd_flags &= ~GFS2_RDF_UPTODATE;

}

}



/**

 * inode_go_sync - Sync the dirty data and/or metadata for an inode glock
@@ -561,7 +569,7 @@ const struct gfs2_glock_operations gfs2_inode_glops = { 
	.go_lock = inode_go_lock,

	.go_dump = inode_go_dump,

	.go_type = LM_TYPE_INODE,

	.go_flags = GLOF_ASPACE,

	.go_flags = GLOF_ASPACE | GLOF_LRU,

};



const struct gfs2_glock_operations gfs2_rgrp_glops = {
@@ -584,10 +592,12 @@ const struct gfs2_glock_operations gfs2_freeze_glops = { 
const struct gfs2_glock_operations gfs2_iopen_glops = {

	.go_type = LM_TYPE_IOPEN,

	.go_callback = iopen_go_callback,

	.go_flags = GLOF_LRU,

};



const struct gfs2_glock_operations gfs2_flock_glops = {

	.go_type = LM_TYPE_FLOCK,

	.go_flags = GLOF_LRU,

};



const struct gfs2_glock_operations gfs2_nondisk_glops = {
@@ -596,7 +606,7 @@ const struct gfs2_glock_operations gfs2_nondisk_glops = { 


const struct gfs2_glock_operations gfs2_quota_glops = {

	.go_type = LM_TYPE_QUOTA,

	.go_flags = GLOF_LVB,

	.go_flags = GLOF_LVB | GLOF_LRU,

};



const struct gfs2_glock_operations gfs2_journal_glops = {

fs/gfs2/incore.h

+2 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ struct gfs2_glock_operations { 
	const unsigned long go_flags;

#define GLOF_ASPACE 1

#define GLOF_LVB    2

#define GLOF_LRU    4

};



enum {
@@ -432,6 +433,7 @@ enum { 
	QDF_CHANGE		= 1,

	QDF_LOCKED		= 2,

	QDF_REFRESH		= 3,

	QDF_QMSG_QUIET          = 4,

};



struct gfs2_quota_data {