search for: mlog_exit

...g)OCFS2_I(inode)->ip_blkno, (unsigned long long)size); - return -EROFS; + status = -EROFS; + goto bail; } kaddr = kmap_atomic(page, KM_USER0); @@ -245,7 +253,9 @@ int ocfs2_read_inline_data(struct inode *inode, struct page *page, SetPageUptodate(page); - return 0; +bail: + mlog_exit(status); + return status; } static int ocfs2_readpage_inline(struct inode *inode, struct page *page) @@ -253,6 +263,8 @@ static int ocfs2_readpage_inline(struct inode *inode, struct page *page) int ret; struct buffer_head *di_bh = NULL; + mlog_entry("(%llu, %lu)\n", OCFS2_I(inod...

...g)OCFS2_I(inode)->ip_blkno, (unsigned long long)size); - return -EROFS; + status = -EROFS; + goto bail; } kaddr = kmap_atomic(page, KM_USER0); @@ -245,7 +254,9 @@ int ocfs2_read_inline_data(struct inode *inode, struct page *page, SetPageUptodate(page); - return 0; +bail: + mlog_exit(status); + return status; } static int ocfs2_readpage_inline(struct inode *inode, struct page *page) @@ -253,6 +264,9 @@ static int ocfs2_readpage_inline(struct inode *inode, struct page *page) int ret; struct buffer_head *di_bh = NULL; + mlog_entry("(%llu, %lu)\n", + (unsig...

...g)OCFS2_I(inode)->ip_blkno, (unsigned long long)size); - return -EROFS; + status = -EROFS; + goto bail; } kaddr = kmap_atomic(page, KM_USER0); @@ -245,7 +254,9 @@ int ocfs2_read_inline_data(struct inode *inode, struct page *page, SetPageUptodate(page); - return 0; +bail: + mlog_exit(status); + return status; } static int ocfs2_readpage_inline(struct inode *inode, struct page *page) @@ -253,6 +264,9 @@ static int ocfs2_readpage_inline(struct inode *inode, struct page *page) int ret; struct buffer_head *di_bh = NULL; + mlog_entry("(%llu, %lu)\n", + (unsig...

...e.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 62442e4..a49fa44 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -1918,8 +1918,10 @@ out_sems: mutex_unlock(&inode->i_mutex); + if (written) + ret = written; mlog_exit(ret); - return written ? written : ret; + return ret; } static int ocfs2_splice_to_file(struct pipe_inode_info *pipe, -- 1.6.2.5

...ecovery.c b/fs/ocfs2/dlm/dlmrecovery.c index bcb9260..ffd48e8 100644 --- a/fs/ocfs2/dlm/dlmrecovery.c +++ b/fs/ocfs2/dlm/dlmrecovery.c @@ -1469,10 +1469,8 @@ leave: dlm_put(dlm); if (ret < 0) { - if (buf) - kfree(buf); - if (item) - kfree(item); + kfree(buf); + kfree(item); } mlog_exit(ret); diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c index f2bb1a0..7640858 100644 --- a/fs/ocfs2/extent_map.c +++ b/fs/ocfs2/extent_map.c @@ -280,8 +280,7 @@ search: spin_unlock(&oi->ip_lock); out: - if (new_emi) - kfree(new_emi); + kfree(new_emi); } static int ocfs2_l...

...x a5887df..ffe7d34 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -1076,6 +1076,8 @@ int ocfs2_getattr(struct vfsmount *mnt, /* We set the blksize from the cluster size for performance */ stat->blksize = osb->s_clustersize; + stat->ino = OCFS2_I(inode)->ip_blkno; + bail: mlog_exit(err);

...llu generation: %u\n", blkno, + handle->ih_generation); + result = ERR_PTR(-ESTALE); + goto bail; } result = d_obtain_alias(inode); - if (!IS_ERR(result)) + if (!IS_ERR(result)) { result->d_op = &ocfs2_dentry_ops; + } else { + mlog_errno((int)result); + } +bail: mlog_exit_ptr(result); return result; } Index: inode.c =================================================================== --- inode.c (revision 139) +++ inode.c (working copy) @@ -112,6 +112,17 @@ void ocfs2_get_inode_flags(struct ocfs2_ oi->ip_attr |= OCFS2_DIRSYNC_FL; } +struct inode *ocfs2_il...

...free_entry); oinfo->dqi_gi.dqi_blocksize_bits = le32_to_cpu(dinfo.dqi_blocksize_bits); + + setup_timer(&oinfo->dqi_sync_timer, qsync_timer_fn, + (unsigned long)oinfo); + mod_timer(&oinfo->dqi_sync_timer, + round_jiffies(jiffies + oinfo->dqi_syncjiff)); out_err: mlog_exit(status); return status; @@ -427,6 +439,60 @@ out: } /* + * Functions for periodic syncing of dquots with global file + */ +static int ocfs2_sync_dquot_helper(struct dquot *dquot, unsigned long type) +{ + handle_t *handle; + struct super_block *sb = dquot->dq_sb; + struct ocfs2_mem_dqinfo...

...generation: %u\n", blkno, + handle->ih_generation); + result = ERR_PTR(-ESTALE); + goto bail; } result = d_obtain_alias(inode); - if (!IS_ERR(result)) + if (!IS_ERR(result)) { result->d_op = &ocfs2_dentry_ops; + } else { + mlog_errno(PTR_ERR(result)); + } +bail: mlog_exit_ptr(result); return result; } Index: suballoc.c =================================================================== --- suballoc.c (revision 139) +++ suballoc.c (working copy) @@ -2116,3 +2116,154 @@ out: return ret; } + +/* reads(hit disk) the inode specified by blkno to get suballoc_slot...

...g(0, "stale inode ino: %llu generation: %u\n", blkno, + handle->ih_generation); + result = ERR_PTR(-ESTALE); + goto bail; } result = d_obtain_alias(inode); if (!IS_ERR(result)) result->d_op = &ocfs2_dentry_ops; + else + mlog_errno(PTR_ERR(result)); +bail: mlog_exit_ptr(result); return result; } diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index 229e707..84f7a60 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c @@ -112,6 +112,17 @@ void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi) oi->ip_attr |= OCFS2_DIRSYNC_FL; } +struct inode *ocfs2...

...g(0, "stale inode ino: %llu generation: %u\n", blkno, + handle->ih_generation); + result = ERR_PTR(-ESTALE); + goto bail; } result = d_obtain_alias(inode); if (!IS_ERR(result)) result->d_op = &ocfs2_dentry_ops; + else + mlog_errno(PTR_ERR(result)); +bail: mlog_exit_ptr(result); return result; } diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index 229e707..84f7a60 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c @@ -112,6 +112,17 @@ void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi) oi->ip_attr |= OCFS2_DIRSYNC_FL; } +struct inode *ocfs2...

...generation: %u\n", blkno, + handle->ih_generation); + result = ERR_PTR(-ESTALE); + goto bail; } result = d_obtain_alias(inode); - if (!IS_ERR(result)) + if (!IS_ERR(result)) { result->d_op = &ocfs2_dentry_ops; + } else { + mlog_errno(PTR_ERR(result)); + } +bail: mlog_exit_ptr(result); return result; } Index: inode.c =================================================================== --- inode.c (revision 139) +++ inode.c (working copy) @@ -112,6 +112,17 @@ void ocfs2_get_inode_flags(struct ocfs2_ oi->ip_attr |= OCFS2_DIRSYNC_FL; } +struct inode *ocfs2_il...

...handle->ih_generation); + result = ERR_PTR(-ESTALE); + goto bail; } result = d_alloc_anon(inode); - if (!result) { iput(inode); - mlog_errno(-ENOMEM); - return ERR_PTR(-ENOMEM); + result = ERR_PTR(-ENOMEM); + goto bail; } + result->d_op = &ocfs2_dentry_ops; +bail: mlog_exit_ptr(result); return result; } diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index ee6bf13..6235bc7 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c @@ -111,6 +111,18 @@ void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi) oi->ip_attr |= OCFS2_DIRSYNC_FL; } +struct inode *ocfs2...

Hi, I'm resending this patch series. It's rediffed against linux-next branch of Joel's git tree. The first four patches are obvious fixes of deadlocks in quota code and should go in as soon as possible. The other three patches implement lockdep support for OCFS2 cluster locks. So you can have a look whether the code make sence to you and possibly merge them. They should be NOP when

...= NULL; - struct buffer_head *insert_entry_bh = NULL; struct ocfs2_super *osb = NULL; u64 newfe_blkno, old_de_ino; handle_t *handle = NULL; @@ -1455,8 +1453,6 @@ bail: brelse(old_inode_bh); brelse(old_dir_bh); brelse(new_dir_bh); - brelse(orphan_entry_bh); - brelse(insert_entry_bh); mlog_exit(status); -- 1.5.5

Hi all, this patch set are the backport of inode alloc improvement from mainline to ocfs2-1.4. the patches are almost the same excpet one thing: Joel has added JBD2 support to ocfs2, so he has added "max_blocks" to alloc_context and add a new function "ocfs2_reserve_clusters_with_limit". We don't have that in ocfs2-1.4. So there are some great difference in patch 2.

...len(target); + link = kzalloc(len + 1, GFP_NOFS); + if (!link) { + status = -ENOMEM; + mlog_errno(status); + goto bail; + } + + memcpy(link, target, len); + nd_set_link(nd, link); bail: - if (page) { - kunmap(page); - page_cache_release(page); - } brelse(bh); - return ERR_PTR(status); + mlog_exit(status); + return status ? ERR_PTR(status) : link; +} + +static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) +{ + char *link = cookie; + + kfree(link); } const struct inode_operations ocfs2_symlink_inode_operations = { .readlink = page_readlink, - .follo...

Hi, here comes the next version of OCFS2 lockdep support. I've dropped patches with fixes from the series since they were already merged. As Joel suggested, I've simplified the main patch a bit so that we don't have ifdefs around lock declarations and there are also a few other minor improvements. Honza

Hi, the first four patches in this series fix locking problems in OCFS2 quota code (three of them can lead to potential deadlocks). The fifth patch reorders ip_alloc_sem for directories to be acquired before localalloc locks. Mark would you please merge these? The last two patches implement lockdep annotations for OCFS2 cluster locks. We annotate all the cluster locks except for special ones

...ually. */ + ocfs2_lock_res_init_once(res); + ocfs2_lock_res_init_common(osb, res, OCFS2_LOCK_TYPE_DEALLOC, blkno, + 0, &ocfs2_dealloc_lops, osb); +} void ocfs2_lock_res_free(struct ocfs2_lock_res *res) { mlog_entry_void(); @@ -727,6 +753,36 @@ static void ocfs2_rename_bast_func(void mlog_exit_void(); } +static void ocfs2_dealloc_ast_func(void *opaque) +{ + struct ocfs2_lock_res *lockres = opaque; + + mlog_entry_void(); + mlog(0, "Dealloc AST fired\n"); + + BUG_ON(!ocfs2_is_dealloc_lock(lockres)); + + ocfs2_generic_ast_func(lockres, 1); + mlog_exit_void(); +} + +static void...