search for: masklog

In upstream ocfs2 code, /proc interface for mask log is updated into files under /sys/fs/o2cb/masklog, comments in fs/ocfs2/cluster/masklog.h are out of date. This patch modifies the commens in cluster/masklog.h, which also provides a bash script example on how to change the log mask bits. Signed-off-by: Coly Li <coly.li at suse.de> --- fs/ocfs2/cluster/masklog.h | 33 ++++++++++++++-----...

Please pull from 'upstream-linus' branch of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git upstream-linus to receive the following updates: fs/ocfs2/aops.c | 20 ++++++++++---------- fs/ocfs2/cluster/masklog.c | 3 +-- 2 files changed, 11 insertions(+), 12 deletions(-) Mark Fasheh: ocfs2: Fix invalid assertion during write on 64k pages Tiger Yang: ocfs2: Fix masklog breakage diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 0023b31..a480b09 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocf...

All, Please review the patches backported to 1.4 from mainline. Sunil

...+++ linux-2.6.16-rc4.ocfs2-staging2/fs/ocfs2/cluster/Makefile 2006-02-21 11:44:53.000000000 -0500 @@ -3,8 +3,7 @@ obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dis obj-$(CONFIG_OCFS2_FS_USERSPACE_CLUSTER) += ocfs2_user_heartbeat.o ocfs2_nodemanager-objs := nodemanager.o heartbeat.o tcp.o net_proc.o \ - masklog.o ver.o sys.o + masklog.o ver.o sys.o disk_heartbeat.o quorum.o -ocfs2_disk_heartbeat-objs := disk_heartbeat.o quorum.o ocfs2_user_heartbeat-objs := user_heartbeat.o diff -ruNpX ../dontdiff linux-2.6.16-rc4.ocfs2-staging1/fs/ocfs2/cluster/nodemanager.c linux-2.6.16-rc4.ocfs2-staging2/fs/ocfs2/...

...4348f32dae3cb6eb4bc21c7ed8f76c0b11e9d6a: Linus Torvalds (1): Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git upstream-linus Coly Li (1): ocfs2: update comments in masklog.h Hisashi Hifumi (1): ocfs2: fdatasync should skip unimportant metadata writeout Jan Kara (5): ocfs2: Fix possible deadlock in ocfs2_global_read_dquot() ocfs2: Fix lock inversion in ocfs2_local_read_info() ocfs2: Fix possible deadlock with quotas in ocfs2_setattr() o...

...insertions(+), 3 deletions(-) fec83555cf8467e5c932fa52177b8f567eb84d94 diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c index 5f6d858..1b81dcb 100644 --- a/fs/ocfs2/dlm/dlmdebug.c +++ b/fs/ocfs2/dlm/dlmdebug.c @@ -44,7 +44,8 @@ #define MLOG_MASK_PREFIX ML_DLM #include "cluster/masklog.h" -int stringify_lockname(const char *lockname, int locklen, char *buf, int len); +static int stringify_lockname(const char *lockname, int locklen, char *buf, + int len); void dlm_print_one_lock_resource(struct dlm_lock_resource *res) { @@ -251,7 +252,8 @@ EXPORT_SYMBOL_GPL(dlm_...

...ependency break Documentation/filesystems/ocfs2.txt | 7 + fs/ocfs2/Makefile | 1 + fs/ocfs2/alloc.c | 908 +++++++++-------------------------- fs/ocfs2/alloc.h | 12 +- fs/ocfs2/aops.c | 3 + fs/ocfs2/cluster/masklog.c | 1 + fs/ocfs2/cluster/masklog.h | 1 + fs/ocfs2/cluster/tcp.c | 3 + fs/ocfs2/dir.c | 75 +-- fs/ocfs2/dlm/dlmast.c | 8 +- fs/ocfs2/dlm/dlmcommon.h | 4 +- fs/ocfs2/dlm/dlmconvert.c | 4 +...

Hi all, This patch set adds batched discard support to ocfs2. Please check. Thanks. Regards, Tao

The versioning information is confusing for end-users. The numbers are stuck at 1.5.0 when the tools have moved to 1.8.3. I suggest removing the versioning system in the kernel altogether and let the kernel version be the guide to debug issues. However, if you think versioning is still required, please state the reason and modify the version string in the ver.* files to reflect the uptodate

All, This is hopefully the final drop of the patches for adding global heartbeat to the o2cb stack. The diff from the previous set is here: http://oss.oracle.com/~smushran/global-hb-diff-2010-10-07 Implemented most of the suggestions provided by Joel and Wengang. The most important one was to activate the feature only at the end, Also, got mostly a clean run with checkpatch.pl. Sunil

This is a forward port for net_proc.c from 1.2.

...ig ./svnocfs2-1.2/fs/ocfs2/dlm/dlmdomain.c --- ./svnocfs2-1.2/fs/ocfs2/dlm/dlmdomain.c.orig 2009-04-22 11:00:47.000000000 +0800 +++ ./svnocfs2-1.2/fs/ocfs2/dlm/dlmdomain.c 2009-04-22 11:33:26.000000000 +0800 @@ -49,6 +49,34 @@ #define MLOG_MASK_PREFIX (ML_DLM|ML_DLM_DOMAIN) #include "cluster/masklog.h" +static void dlm_free_pagevec(void **vec, int pages) +{ + while (pages--) + free_page((unsigned long)vec[pages]); + kfree(vec); +} + +static void **dlm_alloc_pagevec(int pages) +{ + void **vec = kmalloc(pages * sizeof(void *), GFP_KERNEL); + int i; + + if (!vec) + return NULL; + + for (...

...2/symlink.c index ed0a0cf..579dd1b 100644 --- a/fs/ocfs2/symlink.c +++ b/fs/ocfs2/symlink.c @@ -39,6 +39,7 @@ #include <linux/slab.h> #include <linux/pagemap.h> #include <linux/utsname.h> +#include <linux/namei.h> #define MLOG_MASK_PREFIX ML_NAMEI #include <cluster/masklog.h> @@ -54,26 +55,6 @@ #include "buffer_head_io.h" -static char *ocfs2_page_getlink(struct dentry * dentry, - struct page **ppage); -static char *ocfs2_fast_symlink_getlink(struct inode *inode, - struct buffer_head **bh); - -/* get the link contents into pagecache */ -static...

...721824 -0500 +++ linux-2.6.15-staging2/fs/ocfs2/cluster/nodemanager.c 2006-01-08 18:13:52.644398616 -0500 @@ -27,6 +27,7 @@ #include "endian.h" #include "tcp.h" #include "nodemanager.h" +#include "quorum.h" #include "heartbeat.h" #include "masklog.h" #include "sys.h" @@ -740,6 +741,7 @@ static void __exit exit_o2nm(void) configfs_unregister_subsystem(&o2nm_cluster_group.cs_subsys); o2cb_sys_shutdown(); + o2quo_exit(); o2net_exit(); } @@ -750,6 +752,7 @@ static int __init init_o2nm(void) cluster_print_version(...

...> #include <linux/fs.h> #include <linux/quota.h> #include <linux/quotaops.h> #include <linux/dqblk_qtree.h> +#include <linux/jiffies.h> +#include <linux/timer.h> +#include <linux/writeback.h> #define MLOG_MASK_PREFIX ML_QUOTA #include <cluster/masklog.h> @@ -19,6 +23,8 @@ #include "dlmglue.h" #include "quota.h" +static void qsync_timer_fn(unsigned long oinfo_ptr); + static void ocfs2_global_disk2memdqb(struct dquot *dquot, void *dp) { struct ocfs2_global_disk_dqblk *d = dp; @@ -236,11 +242,17 @@ int ocfs2_global_re...

...| 4 + fs/libfs.c | 29 ++ fs/ocfs2/aops.c | 9 +- fs/ocfs2/aops.h | 3 +- fs/ocfs2/cluster/heartbeat.c | 532 ++++++++++++++++++++++++++++++++-- fs/ocfs2/cluster/heartbeat.h | 4 + fs/ocfs2/cluster/masklog.h | 3 +- fs/ocfs2/cluster/nodemanager.c | 5 + fs/ocfs2/cluster/ocfs2_nodemanager.h | 6 + fs/ocfs2/cluster/tcp.c | 5 + fs/ocfs2/dcache.c | 33 ++- fs/ocfs2/dcache.h | 1 + fs/ocfs2/dlm/dlmcommon.h |...

Hello, the following patch series implements quotas for OCFS2. The patch series is based on: git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git linux-next I've adressed Joel's comments, also node recovery is now fully working and I've fixed a few issues I found during my testing. So I'm currently not aware of any bugs. Please review, test, comment. Thanks.

We're currently support two paths from VFS to preallocate unwritten extents(from FS_IOC_RESVSP, or fallocate()), likewise, behavior of punching-hole should be treated as the same, this patch tries to teach file_ioctl() to handle FS_IOC_UNRESVSP, underlying filesystem like ocfs2 is wise enough to do the rest of work;-) Signed-off-by: Tristan Ye <tristan.ye at oracle.com> --- fs/ioctl.c

We're currently support two paths from VFS to preallocate unwritten extents(from FS_IOC_RESVSP, or fallocate()), likewise, behavior of punching-hole should be treated as the same, this patch tries to teach file_ioctl() to handle FS_IOC_UNRESVSP, underlying filesystem like ocfs2 is wise enough to do the rest of work;-) Signed-off-by: Tristan Ye <tristan.ye at oracle.com> --- fs/ioctl.c

...++---- fs/ext3/super.c | 16 +- fs/ext4/super.c | 15 +- fs/ocfs2/Makefile | 2 + fs/ocfs2/alloc.c | 20 +- fs/ocfs2/aops.c | 16 +- fs/ocfs2/buffer_head_io.c | 5 +- fs/ocfs2/cluster/masklog.c | 1 + fs/ocfs2/cluster/masklog.h | 1 + fs/ocfs2/dir.c | 24 +- fs/ocfs2/dlmglue.c | 146 +++++ fs/ocfs2/dlmglue.h | 19 + fs/ocfs2/file.c | 78 ++- fs/ocfs2/file.h | 3 + fs...