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

Commit a5344a95 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] Update git tree name/location
  [DLM] fix iovec length in recvmsg
  [GFS2] Pass the correct value to kunmap_atomic
  [GFS2] Fix bug where lock not held
  [DLM] Kconfig: don't show an empty DLM menu
  [GFS2] Fix uninitialised variable
  [GFS2] Fix a size calculation error
parents 411fdc1a 370298e2

MAINTAINERS

+4 −2
Original line number Diff line number Diff line
@@ -905,7 +905,8 @@ P: David Teigland 
M:	teigland@redhat.com

L:	cluster-devel@redhat.com

W:	http://sources.redhat.com/cluster/

T:	git kernel.org:/pub/scm/linux/kernel/git/steve/gfs-2.6.git

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

T:	git kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git

S:	Supported



DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
@@ -1188,7 +1189,8 @@ P: Steven Whitehouse 
M:	swhiteho@redhat.com

L:	cluster-devel@redhat.com

W:	http://sources.redhat.com/cluster/

T:	git kernel.org:/pub/scm/linux/kernel/git/steve/gfs-2.6.git

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

T:	git kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git

S:	Supported



GIGASET ISDN DRIVERS

fs/dlm/Kconfig

+1 −2
Original line number Diff line number Diff line 
menu "Distributed Lock Manager"

	depends on INET && EXPERIMENTAL

	depends on INET && IP_SCTP && EXPERIMENTAL



config DLM

	tristate "Distributed Lock Manager (DLM)"

	depends on IPV6 || IPV6=n

	depends on IP_SCTP

	select CONFIGFS_FS

	help

	A general purpose distributed lock manager for kernel or userspace

fs/dlm/lowcomms.c

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static int receive_from_sock(void) 
	}

	len = iov[0].iov_len + iov[1].iov_len;



	r = ret = kernel_recvmsg(sctp_con.sock, &msg, iov, 1, len,

	r = ret = kernel_recvmsg(sctp_con.sock, &msg, iov, msg.msg_iovlen, len,

				 MSG_NOSIGNAL | MSG_DONTWAIT);

	if (ret <= 0)

		goto out_close;

fs/gfs2/log.c

+2 −3
Original line number Diff line number Diff line
@@ -569,16 +569,15 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl) 
	else if (sdp->sd_log_tail != current_tail(sdp) && !sdp->sd_log_idle)

		log_write_header(sdp, 0, PULL);

	lops_after_commit(sdp, ai);

	sdp->sd_log_head = sdp->sd_log_flush_head;



	gfs2_log_lock(sdp);

	sdp->sd_log_head = sdp->sd_log_flush_head;

	sdp->sd_log_blks_free -= sdp->sd_log_num_hdrs;



	sdp->sd_log_blks_reserved = 0;

	sdp->sd_log_commited_buf = 0;

	sdp->sd_log_num_hdrs = 0;

	sdp->sd_log_commited_revoke = 0;



	gfs2_log_lock(sdp);

	if (!list_empty(&ai->ai_ail1_list)) {

		list_add(&ai->ai_list, &sdp->sd_ail1_list);

		ai = NULL;

fs/gfs2/lops.c

+2 −2
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static int gfs2_check_magic(struct buffer_head *bh) 
	ptr = kaddr + bh_offset(bh);

	if (*ptr == cpu_to_be32(GFS2_MAGIC))

		rv = 1;

	kunmap_atomic(page, KM_USER0);

	kunmap_atomic(kaddr, KM_USER0);



	return rv;

}
@@ -626,7 +626,7 @@ static void databuf_lo_before_commit(struct gfs2_sbd *sdp) 
				memcpy(bh->b_data,

				       kaddr + bh_offset(bd2->bd_bh),

				       sdp->sd_sb.sb_bsize);

				kunmap_atomic(page, KM_USER0);

				kunmap_atomic(kaddr, KM_USER0);

				*(__be32 *)bh->b_data = 0;

			} else {

				bh = gfs2_log_fake_buf(sdp, bd2->bd_bh);