search for: data_ac

Hi, Just something I don't understand: data <- data.frame(V1=c(1:12),F1=c(rep("a",4),rep("b",4),rep("c",4))) data_ac <- data[which(data$F1 !="b"), ] levels(data_ac$F1) Why the level "b" is always present ? thanks Tristan, R 2.0.1 for Linux Fedora 3 -- ------------------------------------------------------------ Tristan LEFEBURE Laboratoire d'?cologie des hydrosyst?mes fluviau...

..., meta_ac); if (status < 0) { mlog_errno(status); - goto leave; + need_free = 1; + goto bail; } ocfs2_journal_dirty(handle, et->et_root_bh); @@ -4821,6 +4824,19 @@ int ocfs2_add_clusters_in_btree(handle_t *handle, reason = RESTART_TRANS; } +bail: + if (need_free) { + if (data_ac->ac_which == OCFS2_AC_USE_LOCAL) + ocfs2_free_local_alloc_bits(osb, handle, data_ac, + bit_off, num_bits); + else + ocfs2_free_clusters(handle, + data_ac->ac_inode, + data_ac->ac_bh, + ocfs2_clusters_to_blocks(osb->sb, bit_off), + num_bits); + } + leave: if (...

..., meta_ac); if (status < 0) { mlog_errno(status); - goto leave; + need_free = 1; + goto bail; } ocfs2_journal_dirty(handle, et->et_root_bh); @@ -4821,6 +4824,19 @@ int ocfs2_add_clusters_in_btree(handle_t *handle, reason = RESTART_TRANS; } +bail: + if (need_free) { + if (data_ac->ac_which == OCFS2_AC_USE_LOCAL) + ocfs2_free_local_alloc_bits(osb, handle, data_ac, + bit_off, num_bits); + else + ocfs2_free_clusters(handle, + data_ac->ac_inode, + data_ac->ac_bh, + ocfs2_clusters_to_blocks(osb->sb, bit_off), + num_bits); + } + leave: if (...

Hi, These three patches fix the problems in the version two. And them base on the Tao's patches: ocfs2/xattr: xattr improvement The first patch fix some problem in xattr code. The second patch add security EA support. The third patch add ACL support. Best regards, tiger

The patch was created against a 1.4 tree. However, it applies cleanly to mainline too. The patch has been lightly tested. I am running fill_verify_holes on a non sparse volume currently. Please review. Sunil

Hi, I split the previous support security EA patch into four patches for review. Them besed on joel's xattr-28 branch and tao's patch "Merge xattr set transaction". 1: move new_inode out of the transaction. 2: add ocfs2_xattr_set_handle. 3: add security xattr APIs 4: add init_security in mknod. Best regards, tiger

The following patches implement indexed directory support in Ocfs2, mostly according to the design doc I wrote up a while ago: http://oss.oracle.com/osswiki/OCFS2/DesignDocs/IndexedDirectories The patches have been rebased on top of 2.6.29-rc2. It should be trivial to put them into merge_window. Things are what I'd call complete now. I'd like to get these into the merge_window branch

One line fix from Joel's version. Also, some comments removed. 18:58 <sunil> wc->w_first_new_cpos = 18:58 <sunil> - ocfs2_align_bytes_to_clusters(inode->i_sb, i_size_read(inode)); 18:58 <sunil> + ocfs2_clusters_for_bytes(inode->i_sb, i_size_read(inode));

...diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index e71160c..07d8920 100644 --- a/fs/ocfs2/dir.c +++ b/fs/ocfs2/dir.c @@ -2934,7 +2934,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, */ BUG_ON(alloc > 2); - ret = ocfs2_reserve_clusters(osb, alloc, &data_ac); + ret = ocfs2_reserve_clusters(osb, alloc + dx_alloc, &data_ac); if (ret) { mlog_errno(ret); goto out; -- 1.6.1.40.g8ea6a

Hi, The following patches comprise the bulk of Ocfs2 updates for the 2.6.30 merge window. Aside from larger, more involved fixes, we're adding the following features, which I will describe in the order their patches are mailed. Sunil's exported some more state to our debugfs files, and consolidated some other aspects of our debugfs infrastructure. This will further aid us in debugging

...; + int ret = 0, namelen, i; char *de_buf, *limit; struct ocfs2_dir_entry *de; struct buffer_head *dx_leaf_bh; @@ -2934,7 +2934,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, */ BUG_ON(alloc > 2); - ret = ocfs2_reserve_clusters(osb, alloc, &data_ac); + ret = ocfs2_reserve_clusters(osb, alloc + dx_alloc, &data_ac); if (ret) { mlog_errno(ret); goto out; diff --git a/fs/ocfs2/export.c b/fs/ocfs2/export.c index de3da8e..15713cb 100644 --- a/fs/ocfs2/export.c +++ b/fs/ocfs2/export.c @@ -100,7 +100,8 @@ static struct dentry *ocfs2_get_d...

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

...og_exit(ret); return ret; } @@ -1227,6 +1319,10 @@ static int ocfs2_write_cluster(struct address_space *mapping, struct inode *inode = mapping->host; struct ocfs2_extent_tree et; + mlog_entry("(0x%p, %u, %u, 0x%p, 0x%p, 0x%p, %u, %lld, %u)\n", + mapping, phys, unwritten, data_ac, meta_ac, wc, + cpos, user_pos, user_len); + new = phys == 0 ? 1 : 0; if (new || unwritten) should_zero = 1; @@ -1312,7 +1408,7 @@ static int ocfs2_write_cluster(struct address_space *mapping, ocfs2_write_failure(inode, wc, user_pos, user_len); out: - + mlog_exit(ret); return ret...

...og_exit(ret); return ret; } @@ -1227,6 +1326,10 @@ static int ocfs2_write_cluster(struct address_space *mapping, struct inode *inode = mapping->host; struct ocfs2_extent_tree et; + mlog_entry("(0x%p, %u, %u, 0x%p, 0x%p, 0x%p, %u, %lld, %u)\n", + mapping, phys, unwritten, data_ac, meta_ac, wc, + cpos, user_pos, user_len); + new = phys == 0 ? 1 : 0; if (new || unwritten) should_zero = 1; @@ -1312,7 +1415,7 @@ static int ocfs2_write_cluster(struct address_space *mapping, ocfs2_write_failure(inode, wc, user_pos, user_len); out: - + mlog_exit(ret); return ret...

...e in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git fixes Joel Becker (2): configfs: Don't try to d_delete() negative dentries. configfs: Fix race between configfs_readdir() and configfs_d_iput() Marcus Meissner (1): ocfs2: Initialize data_ac (might be used uninitialized) Sunil Mushran (5): ocfs2/dlm: Use negotiated o2dlm protocol version ocfs2/cluster: Increase the live threshold for global heartbeat ocfs2/cluster: Heartbeat mismatch message improved ocfs2: Skip mount recovery for hard-ro mounts ocfs2/dlm...

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

...og_exit(ret); return ret; } @@ -1227,6 +1326,10 @@ static int ocfs2_write_cluster(struct address_space *mapping, struct inode *inode = mapping->host; struct ocfs2_extent_tree et; + mlog_entry("(0x%p, %u, %u, 0x%p, 0x%p, 0x%p, %u, %lld, %u)\n", + mapping, phys, unwritten, data_ac, meta_ac, wc, + cpos, user_pos, user_len); + new = phys == 0 ? 1 : 0; if (new || unwritten) should_zero = 1; @@ -1312,7 +1415,7 @@ static int ocfs2_write_cluster(struct address_space *mapping, ocfs2_write_failure(inode, wc, user_pos, user_len); out: - + mlog_exit(ret); return ret...

Hi all, So I have finally finished the v1 of reflink for ocfs2. It has some bugs that I am still investigating, but the schema is almost there. So I'd like to send it out first for review. And Tristan and I will continue to work on the stability of the code. The general information for reflink, please see http://oss.oracle.com/osswiki/OCFS2/DesignDocs/Reflink. For the design doc, please

Hi all, Change from v1 to v2: bug fix and metadata/credits reservation improvement. The general information for reflink, please see http://oss.oracle.com/osswiki/OCFS2/DesignDocs/Reflink. For the design doc, please see http://oss.oracle.com/osswiki/OCFS2/DesignDocs/RefcountTrees http://oss.oracle.com/osswiki/OCFS2/DesignDocs/ReflinkOperation

...priv, + filldir_t filldir); int ocfs2_prepare_dir_for_insert(struct ocfs2_super *osb, struct inode *dir, struct buffer_head *parent_fe_bh, @@ -76,9 +78,4 @@ int ocfs2_fill_new_dir(struct ocfs2_super *osb, struct buffer_head *fe_bh, struct ocfs2_alloc_context *data_ac); -int ocfs2_check_dir_entry(struct inode *dir, - struct ocfs2_dir_entry *de, - struct buffer_head *bh, - unsigned long offset); - #endif /* OCFS2_DIR_H */ diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index 8bbfc80..f9d01e2 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journ...