From ca4cc7dfe9da4abd956cac8c0b0904650e08b453 Mon Sep 17 00:00:00 2001 From: Sridhar Samudrala Date: Mon, 28 Aug 2006 13:53:01 -0700 Subject: [PATCH] --- yaml --- r: 33684 b: refs/heads/master c: b9ac86727fc02cc7117ef3fe518a4d51cd573c82 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 3 +-- trunk/fs/xfs/xfs_bmap.c | 2 +- trunk/net/sctp/socket.c | 10 +++++++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index cdf38bb772d9..ba04b0637ea8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7288026b8671061aff7663b1766037b3f2573627 +refs/heads/master: b9ac86727fc02cc7117ef3fe518a4d51cd573c82 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 25cd7073a20b..3bab239e82fe 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3296,11 +3296,10 @@ S: Maintained XFS FILESYSTEM P: Silicon Graphics Inc -P: Tim Shimmin, David Chatterton M: xfs-masters@oss.sgi.com +M: nathans@sgi.com L: xfs@oss.sgi.com W: http://oss.sgi.com/projects/xfs -T: git git://oss.sgi.com:8090/xfs/xfs-2.6 S: Supported X86 3-LEVEL PAGING (PAE) SUPPORT diff --git a/trunk/fs/xfs/xfs_bmap.c b/trunk/fs/xfs/xfs_bmap.c index bf46fae303af..3a6137539064 100644 --- a/trunk/fs/xfs/xfs_bmap.c +++ b/trunk/fs/xfs/xfs_bmap.c @@ -4993,7 +4993,7 @@ xfs_bmapi( bma.firstblock = *firstblock; bma.alen = alen; bma.off = aoff; - bma.conv = !!(flags & XFS_BMAPI_CONVERT); + bma.conv = (flags & XFS_BMAPI_CONVERT); bma.wasdel = wasdelay; bma.minlen = minlen; bma.low = flist->xbf_low; diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c index fde3f55bfd4b..dab15949958e 100644 --- a/trunk/net/sctp/socket.c +++ b/trunk/net/sctp/socket.c @@ -1289,9 +1289,13 @@ SCTP_STATIC void sctp_close(struct sock *sk, long timeout) } } - if (sock_flag(sk, SOCK_LINGER) && !sk->sk_lingertime) - sctp_primitive_ABORT(asoc, NULL); - else + if (sock_flag(sk, SOCK_LINGER) && !sk->sk_lingertime) { + struct sctp_chunk *chunk; + + chunk = sctp_make_abort_user(asoc, NULL, 0); + if (chunk) + sctp_primitive_ABORT(asoc, chunk); + } else sctp_primitive_SHUTDOWN(asoc, NULL); }