[Ocfs2-commits] branch, master, updated. e0518a62b324b7c49abd4315340f47d453b76f18
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Tue Jan 5 12:59:39 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 e0518a62b324b7c49abd4315340f47d453b76f18 (commit)
via cc0750df832c3a32ac1136be41c00475a4a49900 (commit)
via da1fcc81bb646d0c9814acdd5acdab4589bf0caa (commit)
via 2e97a295787d04c7c847883bdaf5bd2958b495ba (commit)
via 832987c9be6568f6c9008faadb080745d8128ac9 (commit)
via 72760f919bb21cff905c52606c826e13de6e3b4a (commit)
via a0ac23e5321b7462b9532d7f507e1eeb0107104a (commit)
via 6451f4cd98a0f07a70d94930be4471080d0c12c0 (commit)
via 0a16824a4d0c5e006043305a4c278dca87622f73 (commit)
via 2981830c29bca314009f3a171ed30b520e6d12f8 (commit)
via 5459c768728eee293cc106c3befb067e42bf2949 (commit)
via 858216e7be285d8c65735c722eb5286160f4d317 (commit)
via 056687c57cdcf580dab3c7bc2c1850db358b1df5 (commit)
via 2aa3d5b74ac07c6d9acba0360022160ed88aebb8 (commit)
via baa810d62e74164c037e5c3cb4a708ee4615f120 (commit)
via 4be043aab3e8f5efa57f885bfb6e749c7343a8ee (commit)
via 163595ccd5df9e2230c60ae5f4afe7e2ba6c27b2 (commit)
via 9fa4ab8330b2843a4920042be5ba853cdfec58f4 (commit)
via 4291248e84e4e148eb666f1d9ce4999ece5adbc8 (commit)
via e2b4040db640d2ad5643e95e3876ae0bb4dc91e4 (commit)
via 81d8d54e2261d6f754880359a305bf815a78a987 (commit)
from bc522391f10346db5abd813c17b8f0c46a9375f6 (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 e0518a62b324b7c49abd4315340f47d453b76f18
Author: Tao Ma <tao.ma at oracle.com>
Date: Tue Jan 5 11:45:52 2010 -0800
ocfs2/trivial: Use le16_to_cpu for a disk value in xattr.c
Mainline commit 8ff6af881deccca4f88e03f2fdadb1aac42e9489
In ocfs2_value_metas_in_xattr_header, we should Use
le16_to_cpu for ocfs2_extent_list.l_next_free_rec.
Signed-off-by: Tao Ma <tao.ma at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit cc0750df832c3a32ac1136be41c00475a4a49900
Author: Tao Ma <tao.ma at oracle.com>
Date: Tue Jan 5 11:44:54 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 da1fcc81bb646d0c9814acdd5acdab4589bf0caa
Author: Tristan Ye <tristan.ye at oracle.com>
Date: Tue Jan 5 11:43:45 2010 -0800
Ocfs2: Let ocfs2 support fiemap for symlink and fast symlink.
Mainline commit 86239d59e268a35a49a00fce9c8512a506267f5c
For fast symlink, it can be treated the same as inlined files since
the data extent we want to return of both case all were stored in
metadata block. For symlink, it can be simply treated the same as we
did for regular files.
Signed-off-by: Tristan Ye <tristan.ye at oracle.com>
Acked-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 2e97a295787d04c7c847883bdaf5bd2958b495ba
Author: Tao Ma <tao.ma at oracle.com>
Date: Tue Jan 5 11:37:30 2010 -0800
ocfs2: Set i_nlink properly during reflink.
Mainline commit 10cf1a02f444fdcd50be47cce3fa8bf08251dd9c
We create a file in orphan dir for reflink so that if there
is any error, we don't create any wrong dentry in the dir.
But actually the file in orphan dir should be i_nlink = 0
so that it can be replayed and freed successfully.
This patch first set i_nlink to 0 when creating the file in
orphan dir and then set it to 1(reflink now only works for
regular file) when we move it to the dest dir.
Signed-off-by: Tao Ma <tao.ma at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 832987c9be6568f6c9008faadb080745d8128ac9
Author: Tao Ma <tao.ma at oracle.com>
Date: Tue Jan 5 11:36:07 2010 -0800
ocfs2: Add reflinked file's inode to inode hash eariler.
Mainline commit c7d260afcbc0f9f4074e74796d4e3646875c08e1
We used to add reflinked file's inode to inode hash when
we add it to the dest dir. But actually there is a race.
Consider the following sequence.
1. reflink happens and create the inode in orphan dir.
2. reflink thread is scheduled out because of some io.
3. recovery begins to work and calls ocfs2_recover_orphans.
It calls ocfs2_iget and get a new inode and i_count = 1.
It calls iput then and delete inode. the buffer's
uptodate state is cleared.
This patch move insert_inode_hash to the create function so
that it can be found by step 3 and prevented from deleting
because i_count > 1.
This resolves the bug
http://oss.oracle.com/bugzilla/show_bug.cgi?id=1183.
Signed-off-by: Tao Ma <tao.ma at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 72760f919bb21cff905c52606c826e13de6e3b4a
Author: Tristan Ye <tristan.ye at oracle.com>
Date: Tue Jan 5 11:35:03 2010 -0800
Ocfs2: Should ocfs2 support fiemap for S_IFDIR inode?
Mainline commit 55f4946ed23cbf78efe9f818c4b55e890fe2beff
Let userspace have a chance to get the extent info of a
directory just like extN did.
Signed-off-by: Tristan Ye <tristan.ye at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit a0ac23e5321b7462b9532d7f507e1eeb0107104a
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Tue Jan 5 11:32:34 2010 -0800
ocfs2: Use FIEMAP_EXTENT_SHARED
Mainline commit faf8b70f79edf56fedd531dfcd41f3e73c3e9696
Adds FIEMAP_EXTENT_SHARED flag to refcounted extents.
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 6451f4cd98a0f07a70d94930be4471080d0c12c0
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Tue Jan 5 11:54:09 2010 -0800
fiemap: Add new extent flag FIEMAP_EXTENT_SHARED
Mainline commit 8c0414cd524e9f1c483ffb3ff1c2d860f5c567c8
Some filesystems may allow multiple files to point to a particular
extent. This patch adds flag FIEMAP_EXTENT_SHARED to denote extents
that are shared with other inodes.
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 0a16824a4d0c5e006043305a4c278dca87622f73
Author: Coly Li <coly.li at suse.de>
Date: Tue Jan 5 11:31:44 2010 -0800
ocfs2: replace u8 by __u8 in ocfs2_fs.h
Mainline commit 936545401624217955df4dd44bb71615900e5397
This patch replaces date type 'u8' with '__u8', which follows the coding style of ocfs2_fs.h, and portable to user space
for ocfs2-tools.
Signed-off-by: Coly Li <coly.li at suse.de>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 2981830c29bca314009f3a171ed30b520e6d12f8
Author: Coly Li <coly.li at suse.de>
Date: Tue Jan 5 11:30:15 2010 -0800
ocfs2: explicit declare uninitialized var in user_cluster_connect()
Mainline commit 3a05d7961e6b5fb77660849b56a22feca5d1e0c5
This patch explicitly declares an uninitialized local variable in user_cluster_connect(), to remove a compiling warning.
Signed-off-by: Coly Li <coly.li at suse.de>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 5459c768728eee293cc106c3befb067e42bf2949
Author: Jeff Liu <jeff.liu at oracle.com>
Date: Tue Jan 5 11:29:25 2010 -0800
ocfs2-devel: remove redundant OCFS2_MOUNT_POSIX_ACL check in ocfs2_get_acl_nolock()
Mainline commit f5befbbbf9b7af033c94a1df6acaf79e77a3ceb6
osb->s_mount_opt has already been checked against OCFS2_MOUNT_POSIX_ACL_CHECK before
calling ocfs2_get_acl_nolock() in ocfs2_init_acl() && ocfs2_get_acl(), so remove it.
Signed-off-by: Jeff Liu <jeff.liu at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 858216e7be285d8c65735c722eb5286160f4d317
Author: Jan Kara <jack at suse.cz>
Date: Tue Jan 5 11:28:26 2010 -0800
quota: Move definition of QFMT_OCFS2 to linux/quota.h
Mainline commit 30673930051e5203d0b826b8b8f2454cab453b94
Move definition of this constant to linux/quota.h so that it
cannot clash with other format IDs.
CC: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Jan Kara <jack at suse.cz>
commit 056687c57cdcf580dab3c7bc2c1850db358b1df5
Author: André Goddard Rosa <andre.goddard at gmail.com>
Date: Tue Jan 5 11:25:57 2010 -0800
tree-wide: fix assorted typos all over the place
Mainline commit af901ca181d92aac3a7dc265144a9081a86d8f39
That is "success", "unknown", "through", "performance", "[re|un]mapping"
, "access", "default", "reasonable", "[con]currently", "temperature"
, "channel", "[un]used", "application", "example","hierarchy", "therefore"
, "[over|under]flow", "contiguous", "threshold", "enough" and others.
Signed-off-by: André Goddard Rosa <andre.goddard at gmail.com>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit 2aa3d5b74ac07c6d9acba0360022160ed88aebb8
Author: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
Date: Tue Jan 5 11:24:08 2010 -0800
tree-wide: fix typos "offest" -> "offset"
Mainline commit bf48aabb894fd0639ab72a26e8abbd7683ef23c2
This patch was generated by
git grep -E -i -l 'offest' | xargs -r perl -p -i -e 's/offest/offset/'
Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit baa810d62e74164c037e5c3cb4a708ee4615f120
Author: Tiger Yang <tiger.yang at oracle.com>
Date: Tue Jan 5 11:21:30 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 4be043aab3e8f5efa57f885bfb6e749c7343a8ee
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Tue Jan 5 11:07:40 2010 -0800
ocfs2/cluster: Make fence method configurable
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 163595ccd5df9e2230c60ae5f4afe7e2ba6c27b2
Author: Tao Ma <tao.ma at oracle.com>
Date: Tue Jan 5 11:06:25 2010 -0800
ocfs2: refcounttree.c cleanup.
Mainline commit 12d4cec988a8a20927a9795dbf2c6d9ef2f85baa
sparse check finds some endian problem and some other minor issues.
There is an obsolete function which should be removed.
So this patch resolve all these.
Signed-off-by: Tao Ma <tao.ma at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 9fa4ab8330b2843a4920042be5ba853cdfec58f4
Author: Tao Ma <tao.ma at oracle.com>
Date: Tue Jan 5 11:05:22 2010 -0800
ocfs2: Find proper end cpos for a leaf refcount block.
Mainline commit 38a04e432768ec0b016f3c687b4de31ac111ae59
ocfs2 refcount tree is stored as an extent tree while
the leaf ocfs2_refcount_rec points to a refcount block.
The following step can trip a kernel panic.
mkfs.ocfs2 -b 512 -C 1M --fs-features=refcount $DEVICE
mount -t ocfs2 $DEVICE $MNT_DIR
FILE_NAME=$RANDOM
FILE_NAME_1=$RANDOM
FILE_REF="${FILE_NAME}_ref"
FILE_REF_1="${FILE_NAME}_ref_1"
for((i=0;i<305;i++))
do
# /mnt/1048576 is a file with 1048576 sizes.
cat /mnt/1048576 >> $MNT_DIR/$FILE_NAME
cat /mnt/1048576 >> $MNT_DIR/$FILE_NAME_1
done
for((i=0;i<3;i++))
do
cat /mnt/1048576 >> $MNT_DIR/$FILE_NAME
done
for((i=0;i<2;i++))
do
cat /mnt/1048576 >> $MNT_DIR/$FILE_NAME
cat /mnt/1048576 >> $MNT_DIR/$FILE_NAME_1
done
cat /mnt/1048576 >> $MNT_DIR/$FILE_NAME
for((i=0;i<11;i++))
do
cat /mnt/1048576 >> $MNT_DIR/$FILE_NAME
cat /mnt/1048576 >> $MNT_DIR/$FILE_NAME_1
done
reflink $MNT_DIR/$FILE_NAME $MNT_DIR/$FILE_REF
# write_f is a program which will write some bytes to a file at offset.
# write_f -f file_name -l offset -w write_bytes.
./write_f -f $MNT_DIR/$FILE_REF -l $[310*1048576] -w 4096
./write_f -f $MNT_DIR/$FILE_REF -l $[306*1048576] -w 4096
./write_f -f $MNT_DIR/$FILE_REF -l $[311*1048576] -w 4096
./write_f -f $MNT_DIR/$FILE_NAME -l $[310*1048576] -w 4096
./write_f -f $MNT_DIR/$FILE_NAME -l $[311*1048576] -w 4096
reflink $MNT_DIR/$FILE_NAME $MNT_DIR/$FILE_REF_1
./write_f -f $MNT_DIR/$FILE_NAME -l $[311*1048576] -w 4096
#kernel panic here.
The reason is that if the ocfs2_extent_rec is the last record
in a leaf extent block, the old solution fails to find the
suitable end cpos. So this patch try to walk through the b-tree,
find the next sub root and get the c_pos the next sub-tree starts
from.
btw, I have runned tristan's test case against the patched kernel
for several days and this type of kernel panic never happens again.
Signed-off-by: Tao Ma <tao.ma at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 4291248e84e4e148eb666f1d9ce4999ece5adbc8
Author: Jan Kara <jack at suse.cz>
Date: Tue Jan 5 11:02:04 2010 -0800
ocfs2: Set MS_POSIXACL on remount
Mainline commit 57b09bb5e492c37c1e4273fe4e435ffd1d2ddbe0
We have to set MS_POSIXACL on remount as well. Otherwise VFS
would not know we started supporting ACLs after remount and
thus ACLs would not work.
Signed-off-by: Jan Kara <jack at suse.cz>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit e2b4040db640d2ad5643e95e3876ae0bb4dc91e4
Author: Jan Kara <jack at suse.cz>
Date: Tue Jan 5 11:00:01 2010 -0800
ocfs2: Make acl use the default
Mainline commit 5297aad80cd3a3e62116e0a0b29116ccd8ae397d
Change acl mount options handling to match the one of XFS and BTRFS and
hopefully it is also easier to use now. When admin does not specify any
acl mount option, acls are enabled if and only if the filesystem has
xattr feature enabled. If admin specifies 'acl' mount option, we fail
the mount if the filesystem does not have xattr feature and thus acls
cannot be enabled.
Signed-off-by: Jan Kara <jack at suse.cz>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit 81d8d54e2261d6f754880359a305bf815a78a987
Author: Jan Kara <jack at suse.cz>
Date: Tue Jan 5 10:33:49 2010 -0800
ocfs2: Always include ACL support
Mainline commit e6aabe0cac14a495d42f629a803c5e221089bae8
To become consistent with filesystems such as XFS or BTRFS, make posix
ACLs always available. This also reduces possibility of
misconfiguration on admin's side.
Signed-off-by: Jan Kara <jack at suse.cz>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
-----------------------------------------------------------------------
Summary of changes:
Makefile | 3 +-
configure.in | 5 +
fs/ocfs2/Kconfig | 10 +--
fs/ocfs2/Makefile | 2 -
fs/ocfs2/acl.c | 4 -
fs/ocfs2/acl.h | 22 -----
fs/ocfs2/alloc.c | 12 ++--
fs/ocfs2/alloc.h | 5 +
fs/ocfs2/blockcheck.c | 2 +-
fs/ocfs2/cluster/heartbeat.c | 6 +-
fs/ocfs2/cluster/nodemanager.c | 51 ++++++++++++
fs/ocfs2/cluster/nodemanager.h | 7 ++
fs/ocfs2/cluster/quorum.c | 16 +++-
fs/ocfs2/dlm/dlmmaster.c | 2 +-
fs/ocfs2/dlm/dlmrecovery.c | 18 ++--
fs/ocfs2/dlmglue.c | 2 +-
fs/ocfs2/extent_map.c | 25 +++++-
fs/ocfs2/journal.c | 2 +-
fs/ocfs2/namei.c | 6 +-
fs/ocfs2/ocfs2.h | 8 +-
fs/ocfs2/ocfs2_fs.h | 2 +-
fs/ocfs2/quota.h | 4 -
fs/ocfs2/refcounttree.c | 152 +++++++++++++++++++++++++++--------
fs/ocfs2/stack_user.c | 2 +-
fs/ocfs2/super.c | 95 +++++++++++-----------
fs/ocfs2/symlink.c | 2 +
fs/ocfs2/xattr.c | 6 +-
fs/ocfs2/xattr.h | 2 -
kapi-compat/include/fiemap_shared.h | 8 ++
29 files changed, 318 insertions(+), 163 deletions(-)
create mode 100644 kapi-compat/include/fiemap_shared.h
hooks/post-receive
--
The ocfs2 filesystem version 1.6
More information about the Ocfs2-commits
mailing list