[Ocfs2-commits] branch, master, updated. b251e2ab65167dda087343aedcb06cd9176279a6
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Tue Feb 9 14:53:22 PST 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The ocfs2 filesystem version 1.6".
The branch, master has been updated
via b251e2ab65167dda087343aedcb06cd9176279a6 (commit)
via 76587dc586cde975fda6c134cc8e2db866a73656 (commit)
via 2b0589eafe9b4095910de8a06e7e4795d37c98d5 (commit)
via 2c021d7dfaeb1f51a2f9461e88b4a827da3db32d (commit)
via 47fdf8b73293bf91ab2600908be18e0f9753fc7d (commit)
via 5890db3c25049bf3cf7394a9bb5b9426c3491e19 (commit)
via e73242d8039f9a42286f16b22836d232721c9732 (commit)
via fe10af041fd11c1e664b7e37022cd0aec049d9c5 (commit)
via 943a3b492b6a4ba3ca2d5411fedd68330d95ec6a (commit)
via a17fb03bb01b4ae34643b16f2029049e5bab350e (commit)
via 57c79bfd89a87b2552143b5bdaf42ab70ae88c4b (commit)
via 7e02a452d7667a4f2773f9b25c6c281baa825bdf (commit)
via 785fda4f29bb2d4bf604c16db9d38d166cd531d4 (commit)
via acfc792d5c345356d0ab4dd15c9b4d868ccadb2a (commit)
via cae2bcbf714831d2fa9f18d9e0e1f8743d12f55f (commit)
via b89dcb82d9406ff75257b935ada10991f6ff51ae (commit)
via 7be40afef4038b593f03773b86879903425cb869 (commit)
via 58505343288c280310a001615889de6bc951b5ed (commit)
via e441f983f29f318d9a18e07c9038db7bb9f42c7c (commit)
via 3e4bfad599bbd320a96fc51d6de29856016666f8 (commit)
from 649e07a80d4bac459664d490ed2a59c4ca3d5cdf (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b251e2ab65167dda087343aedcb06cd9176279a6
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Tue Feb 9 12:20:26 2010 -0800
ocfs2/cluster: Make o2net connect messages KERN_NOTICE
Mainline commit 6efd806634f7526f723f3aa7ceffd3887a932d9c
Connect and disconnect messages are more than informational as they are required
during root cause analysis for failures. This patch changes them from KERN_INFO
to KERN_NOTICE.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Acked-by: Mark Faseh <mfasheh at suse.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 76587dc586cde975fda6c134cc8e2db866a73656
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Tue Feb 9 12:19:57 2010 -0800
ocfs2/dlm: Fix printing of lockname
Mainline commit 86a06abab0ffbb9d8ce2b7f6b6652412ce2d2c36
The debug call printing the name of the lock resource was chopping
off the last character. This patch fixes the problem.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Acked-by: Mark Fasheh <mfasheh at suse.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 2b0589eafe9b4095910de8a06e7e4795d37c98d5
Author: Roel Kluin <roel.kluin at gmail.com>
Date: Tue Feb 9 12:19:29 2010 -0800
ocfs2: Fix contiguousness check in ocfs2_try_to_merge_extent_map()
Mainline commit bd6b0bf87d8cf3d9cfeadeb12dbf5449e3e50765
The wrong member was compared in the continguousness check.
Acked-by: Tao Ma <tao.ma at oracle.com>
Signed-off-by: Roel Kluin <roel.kluin at gmail.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 2c021d7dfaeb1f51a2f9461e88b4a827da3db32d
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Tue Feb 9 12:19:07 2010 -0800
ocfs2/dlm: Remove BUG_ON in dlm recovery when freeing locks of a dead node
Mainline commit cda70ba8c05a8661f882862c4699a31d215ab151
During recovery, the dlm frees the locks for the dead node. If it finds a
lock in a resource for the dead node, it expects that node to also have a
ref in that lock resource. If not, it BUGs.
ossbz#1175 was filed with the above BUG. Now, while it is correct that we
should be expecting the ref, I see no reason why we have to BUG. After all,
we are freeing up the lock and clearing the ref.
This patch replaces the BUG_ON with a printk(). Hopefully, that will give
us more clues next time this happens.
http://oss.oracle.com/bugzilla/show_bug.cgi?id=1175
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Acked-by: Mark Fasheh <mfasheh at suse.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 47fdf8b73293bf91ab2600908be18e0f9753fc7d
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Tue Feb 9 12:18:35 2010 -0800
ocfs2: Plugs race between the dc thread and an unlock ast message
Mainline commit 079b805782f94f4b278132286a8c9bc4655d1c51
This patch plugs a race between the downconvert thread and an unlock ast message.
Specifically, after the downconvert worker has done its task, the dc thread needs
to check whether an unlock ast made the downconvert moot.
Reported-by: David Teigland <teigland at redhat.com>
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Acked-by: Mark Fasheh <mfasheh at sus.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 5890db3c25049bf3cf7394a9bb5b9426c3491e19
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Tue Feb 9 12:17:58 2010 -0800
ocfs2: Remove overzealous BUG_ON during blocked lock processing
Mainline commit db0f6ce69776370232431eb8be85a5b18b0019c0
During blocked lock processing, we should consider the possibility that the
lock is no longer blocking.
Joel Becker <joel.becker at oracle.com> assisted in fixing this issue.
Reported-by: David Teigland <teigland at redhat.com>
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit e73242d8039f9a42286f16b22836d232721c9732
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Tue Feb 9 12:17:25 2010 -0800
ocfs2: Do not downconvert if the lock level is already compatible
Mainline commit 0d74125a6a68d4f1969ecaf0b3543f315916ccdc
During upconvert, if the master were to send a BAST, dlmglue will detect the
upconversion in process and send a cancel convert to the master. Upon receiving
the AST for the cancel convert, it will re-process the lock resource to determine
whether it needs downconverting. Say, the up was from PR to EX and the BAST was
for EX. After the cancel convert, it will need to downconvert to NL.
However, if the node was originally upconverting from NL to EX, then there would
be no reason to downconvert (assuming the same message sequence).
This patch makes dlmglue consider the possibility that the current lock level
is already compatible and that downconverting is not required.
Joel Becker <joel.becker at oracle.com> assisted in fixing this issue.
Fixes ossbz#1178
http://oss.oracle.com/bugzilla/show_bug.cgi?id=1178
Reported-by: Coly Li <coly.li at suse.de>
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit fe10af041fd11c1e664b7e37022cd0aec049d9c5
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Tue Feb 9 12:16:53 2010 -0800
ocfs2: Prevent a livelock in dlmglue
Mainline commit a19128260107f951d1b4c421cf98b92f8092b069
There is possibility of a livelock in __ocfs2_cluster_lock(). If a node were
to get an ast for an upconvert request, followed immediately by a bast,
there is a small window where the fs may downconvert the lock before the
process requesting the upconvert is able to take the lock.
This patch adds a new flag to indicate that the upconvert is still in
progress and that the dc thread should not downconvert it right now.
Wengang Wang <wen.gang.wang at oracle.com> and Joel Becker
<joel.becker at oracle.com> contributed heavily to this patch.
Reported-by: David Teigland <teigland at redhat.com>
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 943a3b492b6a4ba3ca2d5411fedd68330d95ec6a
Author: Wengang Wang <wen.gang.wang at oracle.com>
Date: Tue Feb 9 12:16:22 2010 -0800
ocfs2: Fix setting of OCFS2_LOCK_BLOCKED during bast
Mainline commit 0b94a909eb2e2f6990d05fd486a0cb4902ef1ae7
During bast, set the OCFS2_LOCK_BLOCKED flag only if the lock needs to
downconverted.
Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com>
Acked-by: Sunil Mushran <sunil.mushran at oracle.com>
Acked-by: Mark Fasheh <mfasheh at suse.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit a17fb03bb01b4ae34643b16f2029049e5bab350e
Author: Tao Ma <tao.ma at oracle.com>
Date: Tue Feb 9 12:15:54 2010 -0800
ocfs2: Use compat_ptr in reflink_arguments.
Mainline commit 34e6c59af06cbca07b1490ec0015ea2d303470d3
Although we use u64 to pass userspace pointers to the kernel
to avoid compat_ioctl, it doesn't work in some ppc platform.
So wrap them with compat_ptr and add compat_ioctl.
The detailed discussion about compat_ptr can be found in thread
http://lkml.org/lkml/2009/10/27/423.
We indeed met with a bug when testing on ppc(-EFAULT is returned
when using old_path). This patch try to fix this.
I have tested in ppc64(with 32 bit reflink) and x86_64(with i686
reflink), both works.
Signed-off-by: Tao Ma <tao.ma at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 57c79bfd89a87b2552143b5bdaf42ab70ae88c4b
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Tue Feb 9 12:15:15 2010 -0800
ocfs2/dlm: Handle EAGAIN for compatibility - v2
Mainline commit cd34edd8cf80b507bb84b3f0c2988fe05099ffb5
Mainline commit aad1b15310b9bcd59fa81ab8f2b1513b59553ea8 made the
dlm_begin_reco_handler() return -EAGAIN instead of EAGAIN.
As this error is transmitted over the wire, we want the receiver,
dlm_send_begin_reco_message(), to understand both the older EAGAIN and
the newer -EAGAIN, to allow rolling upgrade of the cluster nodes.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 7e02a452d7667a4f2773f9b25c6c281baa825bdf
Author: Tao Ma <tao.ma at oracle.com>
Date: Tue Feb 9 12:14:37 2010 -0800
ocfs2: Add parenthesis to wrap the check for O_DIRECT.
Mainline commit 60c486744c9a30ea60fa863e9587242dde2fe4bd
Add parenthesis to wrap the check for O_DIRECT.
Signed-off-by: Tao Ma <tao.ma at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 785fda4f29bb2d4bf604c16db9d38d166cd531d4
Author: Tao Ma <tao.ma at oracle.com>
Date: Tue Feb 9 12:14:08 2010 -0800
ocfs2: Only bug out when page size is larger than cluster size.
Mainline commit 0a1ea437d87af830786605813972e8e277992917
In CoW, we have to make sure that the page is already written
out to the disk. So we have a BUG_ON(PageDirty(page)).
In ppc platform we have pagesize=64K, so if the cs=4K, if the
file have fragmented clusters, we will map the page many times.
See this file as an example.
Tree Depth: 0 Count: 19 Next Free Rec: 14
## Offset Clusters Block# Flags
0 0 4 2164864 0x2 Refcounted
1 4 2 9302792 0x2 Refcounted
...
We have to replace the extent recs one by one, so the page with index 0
will be mapped and dirtied twice.
I'd like to leave the BUG_ON there while adding a check so that in
case we meet with an error in other platforms, we can find it easily.
Signed-off-by: Tao Ma <tao.ma at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit acfc792d5c345356d0ab4dd15c9b4d868ccadb2a
Author: Tao Ma <tao.ma at oracle.com>
Date: Tue Feb 9 12:13:26 2010 -0800
ocfs2: Fix memory overflow in cow_by_page.
Mainline commit d622b89a2f58613a9c1407b22b02aecdd2187a7c
In ocfs2_duplicate_clusters_by_page, we calculate map_end
by shifting page_index. But actually in case we meet with
a large offset(say in a i686 box, poff_t is only 32 bits
and page_index=2056240), we will overflow. So change the
type of page_index to loff_t.
Signed-off-by: Tao Ma <tao.ma at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit cae2bcbf714831d2fa9f18d9e0e1f8743d12f55f
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Tue Feb 9 12:12:48 2010 -0800
ocfs2/dlm: Print more messages during lock migration
Mainline commit 26636bf6b2010aa84c54d577231e017ba71493d0
When a lock resource is migrated, the dlm compares the migrated
locks with that that was already existing on the new node. If the
comparison fails, it BUGs. This patch prints more messages when the
comparison fails inorder to help with the root cause analyis.
http://oss.oracle.com/bugzilla/show_bug.cgi?id=1206
This does not fix bz1206. However, if we run into it again, we will
have more information to chew on.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit b89dcb82d9406ff75257b935ada10991f6ff51ae
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Tue Feb 9 12:12:23 2010 -0800
ocfs2/dlm: Ignore LVBs of locks in the Blocked list
Mainline commit 71656fa6ec10473eb9b646c10a2173fdea2f83c9
During lock resource migration, o2dlm fills the packet with a LVB from the
first valid lock. For sanity, it ensures that the other valid locks have the
same LVB. If not, it BUGs.
The valid locks are ones that have granted EX or PR lock levels and are either
on the Granted or Converting lists. Locks in the Blocked list cannot have a
valid LVB.
This patch ensures that we skip the locks in the Blocked list.
Fixes oss bugzilla#1202
http://oss.oracle.com/bugzilla/show_bug.cgi?id=1202
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 7be40afef4038b593f03773b86879903425cb869
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Tue Feb 9 12:11:34 2010 -0800
ocfs2/trivial: Remove trailing whitespaces
Mainline commit 2bd632165c1f783888bd4cbed95f2f304829159b
Patch removes trailing whitespaces.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 58505343288c280310a001615889de6bc951b5ed
Author: Wengang Wang <wen.gang.wang at oracle.com>
Date: Tue Feb 9 12:10:49 2010 -0800
ocfs2: fix a misleading variable name
Mainline commit e5f2cb2b1ad05473fffe6970618997b906f23873
a local variable "dlm_version" is used as a fs locking version.
rename it fs_version.
Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit e441f983f29f318d9a18e07c9038db7bb9f42c7c
Author: Tao Ma <tao.ma at oracle.com>
Date: Tue Feb 9 12:10:24 2010 -0800
ocfs2: Sync max_inline_data_with_xattr from tools.
Mainline commit 1097df3ffe855eb1476496fa5394816fb197af05
In ocfs2-tools, we have added ocfs2_max_inline_data_with_xattr,
so add it in the kernel's ocfs2_fs.h.
Signed-off-by: Tao Ma <tao.ma at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 3e4bfad599bbd320a96fc51d6de29856016666f8
Author: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Date: Tue Feb 9 12:09:51 2010 -0800
ocfs2: Fix refcnt leak on ocfs2_fast_follow_link() error path
Mainline commit 1dd473fdf1d8a7531e0955480cd129f9c1e8b8a3
If ->follow_link handler returns an error, it should decrement
nd->path refcnt. But ocfs2_fast_follow_link() doesn't decrement.
This patch fixes the problem by using nd_set_link() style error handling
instead of playing with nd->path.
Signed-off-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
-----------------------------------------------------------------------
Summary of changes:
fs/ocfs2/aops.c | 4 +-
fs/ocfs2/buffer_head_io.c | 2 +-
fs/ocfs2/cluster/heartbeat.c | 6 +-
fs/ocfs2/cluster/tcp.c | 10 ++--
fs/ocfs2/cluster/tcp_internal.h | 4 +-
fs/ocfs2/dlm/dlmapi.h | 2 +-
fs/ocfs2/dlm/dlmast.c | 2 +-
fs/ocfs2/dlm/dlmconvert.c | 2 +-
fs/ocfs2/dlm/dlmdebug.c | 2 +-
fs/ocfs2/dlm/dlmdomain.c | 2 +-
fs/ocfs2/dlm/dlmlock.c | 2 +-
fs/ocfs2/dlm/dlmmaster.c | 38 +++++-----
fs/ocfs2/dlm/dlmrecovery.c | 147 +++++++++++++++++++++++++++-----------
fs/ocfs2/dlm/dlmunlock.c | 8 +-
fs/ocfs2/dlmglue.c | 85 ++++++++++++++++++++---
fs/ocfs2/export.c | 2 +-
fs/ocfs2/extent_map.c | 2 +-
fs/ocfs2/file.c | 18 +++---
fs/ocfs2/inode.c | 4 +-
fs/ocfs2/ioctl.c | 14 ++++-
fs/ocfs2/journal.c | 2 +-
fs/ocfs2/ocfs2.h | 4 +
fs/ocfs2/ocfs2_fs.h | 11 +++-
fs/ocfs2/refcounttree.c | 12 ++-
fs/ocfs2/stack_o2cb.c | 12 ++--
fs/ocfs2/super.c | 2 +-
fs/ocfs2/symlink.c | 10 ++--
fs/ocfs2/uptodate.c | 4 +-
28 files changed, 284 insertions(+), 129 deletions(-)
hooks/post-receive
--
The ocfs2 filesystem version 1.6
More information about the Ocfs2-commits
mailing list