---

yaml --- r: 119675 b: refs/heads/master c: 576a488 h: refs/heads/master i: 119673: edc7c4b 119671: 646677b v: v3
git-mirror · Dec 5, 2008 · 6bc9a96 · 6bc9a96
1 parent dd8d37f
commit 6bc9a96
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 004b50f4ed2accb56069d56714a32484f8b83ec0
+refs/heads/master: 576a488a27f267af203f3ea69c700a1612335e9f
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -3759,15 +3759,6 @@ M:	drzeus-sdhci@drzeus.cx
 L:	sdhci-devel@list.drzeus.cx
 S:	Maintained
 
-SECURITY SUBSYSTEM
-F:	security/
-P:	James Morris
-M:	jmorris@namei.org
-L:	linux-kernel@vger.kernel.org
-L:	linux-security-module@vger.kernel.org (suggested Cc:)
-T:	git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
-S:	Supported
-
 SECURITY CONTACT
 P:	Security Officers
 M:	security@kernel.org

diff --git a/trunk/arch/mn10300/kernel/gdb-io-serial.c b/trunk/arch/mn10300/kernel/gdb-io-serial.c
@@ -99,7 +99,6 @@ int gdbstub_io_rx_char(unsigned char *_ch, int nonblock)
  try_again:
 	/* pull chars out of the buffer */
 	ix = gdbstub_rx_outp;
-	barrier();
 	if (ix == gdbstub_rx_inp) {
 		if (nonblock)
 			return -EAGAIN;
@@ -111,7 +110,6 @@ int gdbstub_io_rx_char(unsigned char *_ch, int nonblock)
 
 	ch = gdbstub_rx_buffer[ix++];
 	st = gdbstub_rx_buffer[ix++];
-	barrier();
 	gdbstub_rx_outp = ix & 0x00000fff;
 
 	if (st & UART_LSR_BI) {

diff --git a/trunk/fs/xfs/xfs_rename.c b/trunk/fs/xfs/xfs_rename.c
@@ -212,7 +212,7 @@ xfs_rename(
 	if (unlikely((target_dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) &&
 		     (target_dp->i_d.di_projid != src_ip->i_d.di_projid))) {
 		error = XFS_ERROR(EXDEV);
-		xfs_rename_unlock4(inodes, XFS_ILOCK_SHARED);
+		xfs_rename_unlock4(inodes, XFS_ILOCK_EXCL);
 		xfs_trans_cancel(tp, cancel_flags);
 		goto std_return;
 	}