Menu
▾
▴
[LV-k25-commit] Linux for the VAX architecture: Changes to 'vax4linus'
|
From: Jan-Benedict G. <jb...@he...> - 2007-08-14 17:54:56
|
fs/dlm/lock.c | 69 +++++++++++++++++++++++++++++++++++++++----------- fs/dlm/lowcomms.c | 24 +++++++++++------ fs/dlm/member.c | 4 ++ fs/dlm/rcom.c | 7 ++--- fs/gfs2/lops.c | 6 ++-- fs/gfs2/mount.c | 25 +++++++++--------- fs/gfs2/ops_address.c | 3 +- fs/gfs2/ops_file.c | 29 ++++++++++++--------- fs/gfs2/rgrp.c | 16 +++++++---- 9 files changed, 124 insertions(+), 59 deletions(-) New commits: commit 38541dcac0b5ea8b16e3b36799ad1f6a97af2f1f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=38541dcac0b5ea8b16e3b36799ad1f6a97af2f1f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=38541dcac0b5ea8b16e3b36799ad1f6a97af2f1f Merge: 5cc3cf83d4f50e146980d6cbd289d4b70d07e806 28e8351ac22de25034e048c680014ad824323c65 Author: Jan-Benedict Glaw <jb...@jb...> Date: Tue Aug 14 19:54:36 2007 +0200 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into vax4linus commit 28e8351ac22de25034e048c680014ad824323c65 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=28e8351ac22de25034e048c680014ad824323c65 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=28e8351ac22de25034e048c680014ad824323c65 Merge: 3b993e8bee32d6dfe04df560eda8e1aff6248a22 d18c4d687dd4625360ee14047d7eb454217719ee Author: Linus Torvalds <tor...@wo...> Date: Tue Aug 14 10:00:29 2007 -0700 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] Revert remounting w/o acl option leaves acls enabled [GFS2] Fix setting of inherit jdata attr [GFS2] Fix incorrect error path in prepare_write() [GFS2] Fix incorrect return code in rgrp.c [GFS2] soft lockup in rgblk_search [GFS2] soft lockup detected in databuf_lo_before_commit [DLM] fix basts for granted PR waiting CW [DLM] More othercon fixes [DLM] Fix memory leak in dlm_add_member() when dlm_node_weight() returns less than zero [DLM] zero unused parts of sockaddr_storage [DLM] fix NULL ls usage [DLM] Clear othercon pointers when a connection is closed commit d18c4d687dd4625360ee14047d7eb454217719ee gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d18c4d687dd4625360ee14047d7eb454217719ee gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d18c4d687dd4625360ee14047d7eb454217719ee Author: Steven Whitehouse <swh...@re...> Date: Thu Jul 19 16:12:50 2007 +0100 [GFS2] Revert remounting w/o acl option leaves acls enabled This reverts commit 569a7b6c2e8965ff4908003b925757703a3d649c. The code was correct originally. The default setting for ACLs after a remount should be to be the same as before the remount. Signed-off-by: Abhijith Das <ad...@re...> Signed-off-by: Steven Whitehouse <swh...@re...> commit b9af7ca6d37d541fb0ed96355fd5c65501cbbda8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b9af7ca6d37d541fb0ed96355fd5c65501cbbda8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b9af7ca6d37d541fb0ed96355fd5c65501cbbda8 Author: Steven Whitehouse <swh...@re...> Date: Wed Jul 18 11:40:06 2007 +0100 [GFS2] Fix setting of inherit jdata attr Due to a mix up between the jdata attribute and inherit jdata attribute it has not been possible to set the inherit jdata attribute on directories. This is now fixed and the ioctl will report the inherit jdata attribute for directories rather than the jdata attribute as it did previously. This stems from our need to have the one bit in the ioctl attr flags mean two different things according to whether the underlying inode is a directory or not. Signed-off-by: Steven Whitehouse <swh...@re...> commit a867bb28c1cb49ae86d034d8bd8fe6dbcbb19566 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a867bb28c1cb49ae86d034d8bd8fe6dbcbb19566 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a867bb28c1cb49ae86d034d8bd8fe6dbcbb19566 Author: Steven Whitehouse <swh...@re...> Date: Tue Jul 17 10:29:02 2007 +0100 [GFS2] Fix incorrect error path in prepare_write() The error path in prepare_write() was incorrect in the (very rare) event that the transaction fails to start. The following prevents a NULL pointer dereference, Signed-off-by: Steven Whitehouse <swh...@re...> commit 6eefaf61f664053c1dd6534a994cab3f8bb07263 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6eefaf61f664053c1dd6534a994cab3f8bb07263 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6eefaf61f664053c1dd6534a994cab3f8bb07263 Author: Steven Whitehouse <swh...@re...> Date: Tue Jul 17 10:26:56 2007 +0100 [GFS2] Fix incorrect return code in rgrp.c The following patch fixes a bug where 0 was being used as a return code to indicate "nothing to do" when in fact 0 was a valid block location which might be returned by the function. Signed-off-by: Steven Whitehouse <swh...@re...> commit 24c7387333c77b602ece7ecd6a85fc94f8f16d8c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=24c7387333c77b602ece7ecd6a85fc94f8f16d8c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=24c7387333c77b602ece7ecd6a85fc94f8f16d8c Author: Bob Peterson <rpe...@re...> Date: Thu Jul 12 16:58:50 2007 -0500 [GFS2] soft lockup in rgblk_search This patch seems to fix the problem described in bugzilla bug 246114. It was written by Steve Whitehouse with some tweaking by me. The code was looping in the relatively new section of code designed to search for and reuse unlinked inodes. In cases where it was finding an appropriate inode to reuse, it was looping around and finding the same block over and over because a "<=" check should have been a "<" when comparing the goal block to the last unlinked block found. Signed-off-by: Bob Peterson <rpe...@re...> Signed-off-by: Steven Whitehouse <swh...@re...> commit bdcb88562ca90e6cfac13130e147c63aaa4f9e41 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bdcb88562ca90e6cfac13130e147c63aaa4f9e41 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bdcb88562ca90e6cfac13130e147c63aaa4f9e41 Author: Bob Peterson <rpe...@re...> Date: Wed Jul 11 15:55:23 2007 -0500 [GFS2] soft lockup detected in databuf_lo_before_commit This is part 2 of the patch for bug #245832, part 1 of which is already in the git tree. The problem was that sdp->sd_log_num_databuf was not always being protected by the gfs2_log_lock spinlock, but the sd_log_le_databuf (which it is supposed to reflect) was protected. That meant there was a timing window during which gfs2_log_flush called databuf_lo_before_commit and the count didn't match what was really on the linked list in that window. So when it ran out of items on the linked list, it decremented total_dbuf from 0 to -1 and thus never left the "while(total_dbuf)" loop. The solution is to protect the variable sdp->sd_log_num_databuf so that the value will always match the contents of the linked list, and therefore the number will never go negative, and therefore, the loop will be exited properly. Signed-off-by: Bob Peterson <rpe...@re...> Signed-off-by: Steven Whitehouse <swh...@re...> commit 3650925893469ccb03dbcc6a440c5d363350f591 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3650925893469ccb03dbcc6a440c5d363350f591 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3650925893469ccb03dbcc6a440c5d363350f591 Author: David Teigland <tei...@re...> Date: Tue Aug 7 09:44:48 2007 -0500 [DLM] fix basts for granted PR waiting CW Fix a long standing bug where a blocking callback would be missed when there's a granted lock in PR mode and waiting locks in both PR and CW modes (and the PR lock was added to the waiting queue before the CW lock). The logic simply compared the numerical values of the modes to determine if a blocking callback was required, but in the one case of PR and CW, the lower valued CW mode blocks the higher valued PR mode. We just need to add a special check for this PR/CW case in the tests that decide when a blocking callback is needed. Signed-off-by: David Teigland <tei...@re...> Signed-off-by: Steven Whitehouse <swh...@re...> commit 9e5f2825a8b721360b291f14f42cd7a25781156b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9e5f2825a8b721360b291f14f42cd7a25781156b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9e5f2825a8b721360b291f14f42cd7a25781156b Author: Patrick Caulfield <pca...@re...> Date: Thu Aug 2 14:58:14 2007 +0100 [DLM] More othercon fixes The last patch to clean out 'othercon' structures only fixed half the problem. The attached addresses the other situations too, and fixes bz#238490 Signed-Off-By: Patrick Caulfield <pca...@re...> Signed-off-by: Steven Whitehouse <swh...@re...> commit 1a2bf2eefb63a267aea7f3f80d6ac59160e20810 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1a2bf2eefb63a267aea7f3f80d6ac59160e20810 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1a2bf2eefb63a267aea7f3f80d6ac59160e20810 Author: Jesper Juhl <jes...@gm...> Date: Thu Jul 19 00:27:43 2007 +0200 [DLM] Fix memory leak in dlm_add_member() when dlm_node_weight() returns less than zero There's a memory leak in fs/dlm/member.c::dlm_add_member(). If "dlm_node_weight(ls->ls_name, nodeid)" returns < 0, then we'll return without freeing the memory allocated to the (at that point yet unused) 'memb'. This patch frees the allocated memory in that case and thus avoids the leak. Signed-off-by: Jesper Juhl <jes...@gm...> Signed-off-by: David Teigland <tei...@re...> Signed-off-by: Steven Whitehouse <swh...@re...> commit 01c8cab25863de007fe8c598d0033919ea8ae65e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=01c8cab25863de007fe8c598d0033919ea8ae65e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=01c8cab25863de007fe8c598d0033919ea8ae65e Author: Patrick Caulfield <pca...@re...> Date: Tue Jul 17 16:53:15 2007 +0100 [DLM] zero unused parts of sockaddr_storage When we build a sockaddr_storage for an IP address, clear the unused parts as they could be used for node comparisons. I have seen this occasionally make sctp connections fail. Signed-Off-By: Patrick Caulfield <pca...@re...> Signed-off-by: Steven Whitehouse <swh...@re...> commit 41684f9547455b395ffd65e5b7961067d20a2872 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=41684f9547455b395ffd65e5b7961067d20a2872 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=41684f9547455b395ffd65e5b7961067d20a2872 Author: David Teigland <tei...@re...> Date: Fri Jul 13 14:49:06 2007 -0500 [DLM] fix NULL ls usage Fix regression in recent patch "[DLM] variable allocation" which attempts to dereference an "ls" struct when it's NULL. Signed-off-by: David Teigland <tei...@re...> Signed-off-by: Steven Whitehouse <swh...@re...> commit 25720c2d73058f4f929f16093f60817ed52a285c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=25720c2d73058f4f929f16093f60817ed52a285c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=25720c2d73058f4f929f16093f60817ed52a285c Author: Patrick Caulfield <pca...@re...> Date: Wed Jul 11 13:39:43 2007 +0100 [DLM] Clear othercon pointers when a connection is closed This patch clears the othercon pointer and frees the memory when a connnection is closed. This could cause a small memory leak when nodes leave the cluster. Signed-Off-By: Patrick Caulfield <pca...@re...> Signed-off-by: Steven Whitehouse <swh...@re...> |
