Commit 0782588b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes 

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  [GFS2] Fix bz 229873, alternate test: assertion "!ip->i_inode.i_mapping->nrpages" failed
  [GFS2] build fix
  [GFS2] go_drop_bh is never used, so remove it
  [GFS2] Remove unused variable
  [GFS2] Fix bz 229831, lookup returns wrong inode
  [GFS2] Fix bz 230143, incorrect flushing of rgrps
  [GFS2] pass formal ino in do_filldir_main
  [DLM] fs/dlm/user.c should #include "user.h"
  [GFS2] fix hangup when multiple processes are trying to write to the same file
  [GFS2] NFS filehandle check
  [GFS2] add newline to printk message
  [GFS2] fix locking mistake
parents d694c16b c3f49bc2

fs/dlm/user.c

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

#include "lock.h"

#include "lvb_table.h"

#include "user.h"



static const char *name_prefix="dlm";

static struct miscdevice ctl_device;

fs/gfs2/glock.c

+1 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/list.h>

#include <linux/lm_interface.h>

#include <linux/wait.h>

#include <linux/module.h>

#include <linux/rwsem.h>

#include <asm/uaccess.h>
@@ -953,9 +954,6 @@ static void drop_bh(struct gfs2_glock *gl, unsigned int ret) 
		spin_unlock(&gl->gl_spin);

	}



	if (glops->go_drop_bh)

		glops->go_drop_bh(gl);



	spin_lock(&gl->gl_spin);

	gl->gl_req_gh = NULL;

	gl->gl_req_bh = NULL;

fs/gfs2/glops.c

+2 −1
Original line number Diff line number Diff line
@@ -245,7 +245,6 @@ static void inode_go_inval(struct gfs2_glock *gl, int flags) 


	if (ip && S_ISREG(ip->i_inode.i_mode)) {

		truncate_inode_pages(ip->i_inode.i_mapping, 0);

		gfs2_assert_withdraw(GFS2_SB(&ip->i_inode), !ip->i_inode.i_mapping->nrpages);

		clear_bit(GIF_PAGED, &ip->i_flags);

	}

}
@@ -459,6 +458,8 @@ const struct gfs2_glock_operations gfs2_inode_glops = { 
};



const struct gfs2_glock_operations gfs2_rgrp_glops = {

	.go_xmote_th = meta_go_sync,

	.go_drop_th = meta_go_sync,

	.go_inval = meta_go_inval,

	.go_demote_ok = rgrp_go_demote_ok,

	.go_lock = rgrp_go_lock,

fs/gfs2/incore.h

+0 −2
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ struct gfs2_glock_operations { 
	void (*go_xmote_th) (struct gfs2_glock *gl);

	void (*go_xmote_bh) (struct gfs2_glock *gl);

	void (*go_drop_th) (struct gfs2_glock *gl);

	void (*go_drop_bh) (struct gfs2_glock *gl);

	void (*go_inval) (struct gfs2_glock *gl, int flags);

	int (*go_demote_ok) (struct gfs2_glock *gl);

	int (*go_lock) (struct gfs2_holder *gh);
@@ -416,7 +415,6 @@ struct gfs2_tune { 
	unsigned int gt_stall_secs; /* Detects trouble! */

	unsigned int gt_complain_secs;

	unsigned int gt_reclaim_limit; /* Max num of glocks in reclaim list */

	unsigned int gt_entries_per_readdir;

	unsigned int gt_statfs_quantum;

	unsigned int gt_statfs_slow;

};

fs/gfs2/inode.c

+4 −3
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ static int iget_test(struct inode *inode, void *opaque) 
	struct gfs2_inode *ip = GFS2_I(inode);

	struct gfs2_inum_host *inum = opaque;



	if (ip->i_num.no_addr == inum->no_addr)

	if (ip->i_num.no_addr == inum->no_addr &&

	    inode->i_private != NULL)

		return 1;



	return 0;
@@ -61,13 +62,13 @@ static int iget_set(struct inode *inode, void *opaque) 


struct inode *gfs2_ilookup(struct super_block *sb, struct gfs2_inum_host *inum)

{

	return ilookup5(sb, (unsigned long)inum->no_formal_ino,

	return ilookup5(sb, (unsigned long)inum->no_addr,

			iget_test, inum);

}



static struct inode *gfs2_iget(struct super_block *sb, struct gfs2_inum_host *inum)

{

	return iget5_locked(sb, (unsigned long)inum->no_formal_ino,

	return iget5_locked(sb, (unsigned long)inum->no_addr,

		     iget_test, iget_set, inum);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE