[Ocfs2-commits] branch, master, updated. ocfs2-1.4.0-175-ge882faf
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Thu Mar 4 10:49:30 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.4".
The branch, master has been updated
via e882faf84930431524f84598caea7d4e9a9529c5 (commit)
via 5d7fc40ca0ea7951564816183df504e52245be0e (commit)
via 63a7296c9a6ac1936a64842cdefb095c781329ad (commit)
via 766326d0e3d42c62ef3edd253679942a5a508e2b (commit)
via 850f83e93944fa9d05d06b0e369d154f509dd289 (commit)
via e4a5b7b701db0e3e3211f21d4903941af53fb875 (commit)
via aa20775d1e7feba9b22e761fa9b69bd5c3f043bd (commit)
via b114aa8f6ed9a5c412d4fdaa50321ef2fe9426ed (commit)
via 6db7623ae4effa8b36c37fee76e2fd3c480ad368 (commit)
via 39fd0acf56c1128ffd6b1ba93d2409063f12f1c2 (commit)
via a6d5f7d84d8bcc421df3595e0289dca27c005e7f (commit)
via 5b0615de78f084c4de4e99f03de010eeed267232 (commit)
via 3b0af8cb517d862d3d4f26681f09c4ae6aa356ff (commit)
via 39febfd5ee7948c018b667e0b909886e1cfa1235 (commit)
via e8ef96c444326e4262fd371729e7beebda1af4d1 (commit)
via 8b87ce95465379ea874a5628f521ade80464ab19 (commit)
via ec42ee0ffd822d46f7af9f09c68bfa1611cae5a1 (commit)
via fcb51756c7fd96ef430715a10eb0754d2c925b35 (commit)
via 96c556d0a85245ce2926c9ed96131bb16887501e (commit)
via e815603d54730696d73accddd03d588243a933d3 (commit)
via 664f8f35b354baef70c0a353c9ae86d1fd26dd62 (commit)
via ecbd154ea56790f7900e265cd08011ee8f9760e4 (commit)
via 60f8f8fae69e0391e51ba62392db4af18217f381 (commit)
via 25268932d6abbddfe7b5d456b7b7be3cd82adf6a (commit)
via ccd76c60590a13a7d0c096132c5ec0301038716e (commit)
via e4d0efbd96cb471e0d95daba506cabd04499b5ff (commit)
via b0acee56511643bbd9cfebac3bee16e0899df33a (commit)
via e8394f8462d5e93e1a9142441082e7d5a61201af (commit)
via 20a1f30c41069a1e7a64895a28150dd96df0e0f8 (commit)
via 540c9147572ad2c28f58f69780f5e705eea8971f (commit)
via 8fc23bbc35300f8008782aca0e272c85aaa2bf00 (commit)
via 5eaa48dd49972bfcab27cc33fb9fffe0417c8fc3 (commit)
from 2d561d3636c80af24063a74ae8c817661c574d78 (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 e882faf84930431524f84598caea7d4e9a9529c5
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Wed Mar 3 16:22:02 2010 -0800
ocfs2: Up version to 1.4.5
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
commit 5d7fc40ca0ea7951564816183df504e52245be0e
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Wed Mar 3 16:02:29 2010 -0800
ocfs2/userdlm: Add tracing in userdlm
Mainline commit 6fcef3f04a1a0f8d7a086147d2f2e650c8cc2754
Make use of the newly added BASTS masklog to trace ASTs and BASTs in userdlm.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 63a7296c9a6ac1936a64842cdefb095c781329ad
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Wed Mar 3 16:12:40 2010 -0800
ocfs2: Use a separate masklog for AST and BASTs
Mainline commit 9b915181af0a99fe94ef0152e6a4ca9990c3b6d0
This patch adds a new masklog and uses it allow tracing ASTs and BASTs
in the dlmglue layer. This has been found to be very useful in debugging
cluster locking issues.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 766326d0e3d42c62ef3edd253679942a5a508e2b
Author: Srinivas Eeda <srinivas.eeda at oracle.com>
Date: Wed Mar 3 13:45:51 2010 -0800
ocfs2/dlm: allow dlm do recovery during shutdown
Mainline commit bc9838c4d44a1713ab1bf24aa6675bc3a02b6a88
If a node down event happens while dlm shutdown in progress, dlm recovery
should be done before dlm is shutdown. We can't migrate unrecovered locks,
obviously. But dlm_reco_thread only does recovery if the dlm_state is
in DLM_CTXT_JOINED.
dlm_reco_thread should do recovery if dlm_state is in DLM_CTXT_JOINED or
DLM_CTXT_IN_SHUTDOWN.
Signed-off-by: Srinivas Eeda <srinivas.eeda at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 850f83e93944fa9d05d06b0e369d154f509dd289
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Wed Mar 3 13:44:20 2010 -0800
ocfs2: Add current->comm in trace output
Mainline commit 8545e03d82b6739461bbd60db7aba144f7dbe80f
Add current->comm to the standard mlog() output to help with debugging.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit e4a5b7b701db0e3e3211f21d4903941af53fb875
Author: Tiger Yang <tiger.yang at oracle.com>
Date: Wed Mar 3 13:28:14 2010 -0800
ocfs2: Add extent block stealing
Mainline commit b89c54282db0c8634a2d2dc200f196d571750ce5
This patch add extent block (metadata) stealing mechanism for
extent allocation. This mechanism is same as the inode stealing.
if no room in slot specific extent_alloc, we will try to
allocate extent block from the next slot.
Signed-off-by: Tiger Yang <tiger.yang at oracle.com>
Acked-by: Tao Ma <tao.ma at oracle.com>
commit aa20775d1e7feba9b22e761fa9b69bd5c3f043bd
Author: wengang wang <wen.gang.wang at oracle.com>
Date: Mon Mar 1 18:21:07 2010 -0800
ocfs2: fix rare stale inode errors when exporting via nfs
Mainline commit 6ca497a83e592d64e050c4d04b6dedb8c915f39a
For nfs exporting, ocfs2_get_dentry() returns the dentry for fh.
ocfs2_get_dentry() may read from disk when the inode is not in memory,
without any cross cluster lock. this leads to the file system loading a
stale inode.
This patch fixes above problem.
Solution is that in case of inode is not in memory, we get the cluster
lock(PR) of alloc inode where the inode in question is allocated from (this
causes node on which deletion is done sync the alloc inode) before reading
out the inode itsself. then we check the bitmap in the group (the inode in
question allcated from) to see if the bit is clear. if it's clear then it's
stale. if the bit is set, we then check generation as the existing code
does.
We have to read out the inode in question from disk first to know its alloc
slot and allot bit. And if its not stale we read it out using ocfs2_iget().
The second read should then be from cache.
And also we have to add a per superblock nfs_sync_lock to cover the lock for
alloc inode and that for inode in question. this is because ocfs2_get_dentry()
and ocfs2_delete_inode() lock on them in reverse order. nfs_sync_lock is locked
in EX mode in ocfs2_get_dentry() and in PR mode in ocfs2_delete_inode(). so
that mutliple ocfs2_delete_inode() can run concurrently in normal case.
Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com>
Acked-by: Sunil Mushran <sunil.mushran at oracle.com>
commit b114aa8f6ed9a5c412d4fdaa50321ef2fe9426ed
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 1 15:37:58 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 6db7623ae4effa8b36c37fee76e2fd3c480ad368
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 1 15:18:26 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 39fd0acf56c1128ffd6b1ba93d2409063f12f1c2
Author: Roel Kluin <roel.kluin at gmail.com>
Date: Mon Mar 1 15:18:07 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 a6d5f7d84d8bcc421df3595e0289dca27c005e7f
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 1 15:17:48 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 5b0615de78f084c4de4e99f03de010eeed267232
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 1 15:17:27 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 3b0af8cb517d862d3d4f26681f09c4ae6aa356ff
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 1 17:55:43 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 39febfd5ee7948c018b667e0b909886e1cfa1235
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 1 17:54:27 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 e8ef96c444326e4262fd371729e7beebda1af4d1
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 1 15:13:41 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 8b87ce95465379ea874a5628f521ade80464ab19
Author: Wengang Wang <wen.gang.wang at oracle.com>
Date: Mon Mar 1 15:13:19 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 ec42ee0ffd822d46f7af9f09c68bfa1611cae5a1
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 1 15:13:00 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 fcb51756c7fd96ef430715a10eb0754d2c925b35
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 1 15:12:40 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 96c556d0a85245ce2926c9ed96131bb16887501e
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 1 15:12:19 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 e815603d54730696d73accddd03d588243a933d3
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 1 17:45:12 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 664f8f35b354baef70c0a353c9ae86d1fd26dd62
Author: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Date: Mon Mar 1 15:11:37 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>
commit ecbd154ea56790f7900e265cd08011ee8f9760e4
Author: Tao Ma <tao.ma at oracle.com>
Date: Mon Mar 1 15:11:16 2010 -0800
ocfs2/trivial: Use proper mask for 2 places in hearbeat.c
Mainline commit b31d308ddcfb73349582a0196b5f65dad3cf5d17
I just noticed today that there are 2 places of "mlog(0,...)"
in fs/ocfs2/cluster/heartbeat.c, but actually have no default
mask prefix in that file.
So change them to mlog(ML_HEARTBEAT,...).
Signed-off-by: Tao Ma <tao.ma at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 60f8f8fae69e0391e51ba62392db4af18217f381
Author: Tiger Yang <tiger.yang at oracle.com>
Date: Mon Mar 1 15:10:55 2010 -0800
ocfs2: return -EAGAIN instead of EAGAIN in dlm
Mainline commit aad1b15310b9bcd59fa81ab8f2b1513b59553ea8
We used to return positive EAGAIN to indicate a retry action
is needed in dlm_begin_reco_handler(). Now we return negative
-EAGAIN to erase the confusion caused by this error code.
Signed-off-by: Tiger Yang <tiger.yang at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 25268932d6abbddfe7b5d456b7b7be3cd82adf6a
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 1 17:25:57 2010 -0800
ocfs2/cluster: Make fence method configurable - v2
Mainline commit f6656d26d17b2598f43cd41be088853fa2a03397
By default, o2cb fences the box by calling emergency_restart(). While this
scheme works well in production, it comes in the way during testing as it
does not let the tester take stack/core dumps for analysis.
This patch allows user to dynamically change the fence method to panic() by:
# echo "panic" > /sys/kernel/config/cluster/<clustername>/fence_method
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit ccd76c60590a13a7d0c096132c5ec0301038716e
Author: Coly Li <coly.li at suse.de>
Date: Mon Mar 1 15:10:11 2010 -0800
ocfs2: return f_fsid info in ocfs2_statfs()
Mainline commit 837711f862bb71ac263837a0f0714dd8cc4ef7ea
Currently the f_fsid of struct kstatfs returned from ocfs2_statfs() is
undefined (vfs layer fills in 0 as default). Since in some conditions,
f_fsid value might be used in a (f_fsid, ino) pair to uniquely identify
a file, ocfs2 should return a unique defined f_fsid value from
ocfs2_statfs().
Because uuid_str is the same on big or litlle endian machine, it's
endian consistent to use osb->uuid_str to generate f_fsid value.
Signed-off-by: Coly Li <coly.li at suse.de>
Cc: Sunil Mushran <sunil.mushran at oracle.com>
Cc: Mark Fasheh <mfasheh at suse.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit e4d0efbd96cb471e0d95daba506cabd04499b5ff
Author: Joel Becker <joel.becker at oracle.com>
Date: Mon Mar 1 15:09:51 2010 -0800
ocfs2: Return -EINVAL when a device is not ocfs2.
Mainline commit fb5cbe9efd741b16e72133613747f76490bbecd3
In case of non-modular kernels the root filesystem is mounted by trying
several filesystems. If ocfs2 was tried before the actual filesystem
type, the mount would fail because ocfs2_sb_probe() returns -EAGAIN
instead of -EINVAL. ocfs2 will now return -EINVAL properly.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Reported-by: Laszlo Attila Toth <panther at balabit.hu>
commit b0acee56511643bbd9cfebac3bee16e0899df33a
Author: Wengang Wang <wen.gang.wang at oracle.com>
Date: Mon Mar 1 15:09:31 2010 -0800
ocfs2: add spinlock protection when dealing with lockres->purge.
Mainline commit 83e32d9044a4510fffdf65c2691a25c0ba84e259
when we check/modify lockres->purge, we should with the protection of lockres->spinlock.
in dlm_purge_lockres(), the checking/modifying is not with the protectin.
this patch fixes it.
Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit e8394f8462d5e93e1a9142441082e7d5a61201af
Author: Coly Li <coly.li at suse.de>
Date: Mon Mar 1 15:09:09 2010 -0800
dlmglue.c: add missed mlog lines
Mainline commit d92bc5127b27f315ef0ef2c1e1829fd6a5cba54a
This patch adds the missed mlog_exit() and mlog_exit_void() lines when routines
return.
Signed-off-by: Coly Li <coly.li at suse.de>
Acked-by: Mark Fasheh <mfasheh at suse.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 20a1f30c41069a1e7a64895a28150dd96df0e0f8
Author: Goldwyn Rodrigues <rgoldwyn at gmail.com>
Date: Mon Mar 1 15:07:58 2010 -0800
ocfs2: Remove redundant BUG_ON in __dlm_queue_ast()
Mainline commit ab57a40827d99e2d8e59066a56b93bf6c844c916
We BUG_ON() the same thing twice.
Signed-off-by: Goldwyn Rodrigues <rgoldwyn at suse.de>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 540c9147572ad2c28f58f69780f5e705eea8971f
Author: Wengang Wang <wen.gang.wang at oracle.com>
Date: Mon Mar 1 15:07:37 2010 -0800
ocfs2: Fix error return in ocfs2_write_cluster()
Mainline commit cbfa9639aea5007313b75ec43b689d5f9e0c037d
A typo caused ocfs2_write_cluster() to return 0 in some error cases.
Fix it.
Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 8fc23bbc35300f8008782aca0e272c85aaa2bf00
Author: Wengang Wang <wen.gang.wang at oracle.com>
Date: Mon Mar 1 15:07:15 2010 -0800
ocfs2: log the actual return value of ocfs2_file_aio_write()
Mainline commit 812e7a6a43fc34bc8f70c2b80db4ea5997d66ea8
in ocfs2_file_aio_write(), log_exit() could don't log the value
which is really returned. this patch fixes it.
Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 5eaa48dd49972bfcab27cc33fb9fffe0417c8fc3
Author: Jeff Liu <jeff.liu at oracle.com>
Date: Mon Mar 1 15:06:51 2010 -0800
ocfs2: trivial fix for s/migrate/migration/ in dlmrecovery.c logging
Mainline commit 17ae26b669886efe237b77439e43eb390fceb119
in dlmrecovery.c:1121, replace 'migrate' to 'migration' to keep the consistency
by comparing to other lines with the similar log info in the same file.
Signed-off-by: Jeff Liu <jeff.liu at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
-----------------------------------------------------------------------
Summary of changes:
configure.in | 2 +-
fs/ocfs2/alloc.c | 5 +-
fs/ocfs2/aops.c | 8 +-
fs/ocfs2/buffer_head_io.c | 4 +-
fs/ocfs2/cluster/heartbeat.c | 12 +-
fs/ocfs2/cluster/masklog.c | 1 +
fs/ocfs2/cluster/masklog.h | 7 +-
fs/ocfs2/cluster/nodemanager.c | 52 ++++++
fs/ocfs2/cluster/nodemanager.h | 7 +
fs/ocfs2/cluster/quorum.c | 16 ++-
fs/ocfs2/cluster/tcp.c | 12 +-
fs/ocfs2/cluster/tcp_internal.h | 4 +-
fs/ocfs2/dlm/dlmapi.h | 2 +-
fs/ocfs2/dlm/dlmast.c | 3 +-
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 | 167 +++++++++++++------
fs/ocfs2/dlm/dlmthread.c | 6 +-
fs/ocfs2/dlm/dlmunlock.c | 8 +-
fs/ocfs2/dlm/userdlm.c | 44 +++---
fs/ocfs2/dlmglue.c | 223 ++++++++++++++++++++++----
fs/ocfs2/dlmglue.h | 2 +
fs/ocfs2/export.c | 91 +++++++++--
fs/ocfs2/extent_map.c | 2 +-
fs/ocfs2/file.c | 18 ++-
fs/ocfs2/inode.c | 33 ++++-
fs/ocfs2/inode.h | 1 +
fs/ocfs2/journal.c | 2 +-
fs/ocfs2/localalloc.c | 2 +-
fs/ocfs2/ocfs2.h | 34 +---
fs/ocfs2/ocfs2_lockid.h | 5 +
fs/ocfs2/suballoc.c | 339 ++++++++++++++++++++++++++++++++++-----
fs/ocfs2/suballoc.h | 4 +
fs/ocfs2/super.c | 32 +++--
fs/ocfs2/symlink.c | 12 +-
fs/ocfs2/uptodate.c | 6 +-
39 files changed, 935 insertions(+), 277 deletions(-)
hooks/post-receive
--
The ocfs2 filesystem version 1.4
More information about the Ocfs2-commits
mailing list