search for: quota_loc

Hi, here is the second version of OCFS2 quota fixes with Joel's comments fixed. Also I've added a patch defining counts of credits for quota operations as Joel asked. Honza

...ow in ocfs2_local_free_info(), it returns 0 even if it actually fails. Though it doesn't cause any real problem since the only caller dquot_disable() ignores the return value, we'd better return correct as it is. Signed-off-by: Joseph Qi <joseph.qi at linux.alibaba.com> --- fs/ocfs2/quota_local.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c index 5022b3e9bfcd..dfaae1e52412 100644 --- a/fs/ocfs2/quota_local.c +++ b/fs/ocfs2/quota_local.c @@ -811,7 +811,7 @@ static int ocfs2_local_free_info(struct super_block...

...ements functions and timer setup which handles periodic syncing of locally cached quota information to global quota file. Signed-off-by: Jan Kara <jack at suse.cz> --- fs/ocfs2/quota.h | 3 ++ fs/ocfs2/quota_global.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++ fs/ocfs2/quota_local.c | 4 +++ 3 files changed, 73 insertions(+), 0 deletions(-) diff --git a/fs/ocfs2/quota.h b/fs/ocfs2/quota.h index 33b47eb..f837265 100644 --- a/fs/ocfs2/quota.h +++ b/fs/ocfs2/quota.h @@ -14,6 +14,7 @@ #include <linux/quota.h> #include <linux/list.h> #include <linux/dqblk...

Hi, I did some more in-depth testing of OCFS2 quota code, especially with ECC feature enabled and spotted some problems. First four patches fix them. I need the fifth patch to be able to mount OCFS2 filesystem with 2.6.31-rc3. The sixth patch fixes a potential problem when quota syncing interval is updated while the cluster is running (which is not possible currently). Joel, could you please

...i_mutex, I_MUTEX_QUOTA); - if (gqinode->i_size < off + len) { + if (i_size_read(gqinode) < off + len) { down_write(&OCFS2_I(gqinode)->ip_alloc_sem); err = ocfs2_extend_no_holes(gqinode, off + len, off); up_write(&OCFS2_I(gqinode)->ip_alloc_sem); diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c index 07deec5..cf9deab 100644 --- a/fs/ocfs2/quota_local.c +++ b/fs/ocfs2/quota_local.c @@ -938,14 +938,14 @@ static struct ocfs2_quota_chunk *ocfs2_local_quota_add_chunk( /* We are protected by dqio_sem so no locking needed */ status = ocfs2_extend_no_holes(lqino...

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

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

...| 44 ++- fs/ocfs2/ocfs2.h | 7 +- fs/ocfs2/ocfs2_fs.h | 126 ++++- fs/ocfs2/ocfs2_lockid.h | 5 + fs/ocfs2/quota.h | 117 ++++ fs/ocfs2/quota_global.c | 990 ++++++++++++++++++++++++++++ fs/ocfs2/quota_local.c | 1253 ++++++++++++++++++++++++++++++++++++ fs/ocfs2/super.c | 277 ++++++++- fs/ocfs2/xattr.c | 567 +++++++++-------- fs/quota.c | 11 +- fs/quota_tree.c | 645 +++++++++++++++++++ fs/quota_tree.h...

...glue.h | 11 +++ fs/ocfs2/file.c | 56 ++++++++------ fs/ocfs2/journal.c | 111 ++++++++++++++++++++++++++ fs/ocfs2/journal.h | 4 + fs/ocfs2/ocfs2.h | 16 ++++ fs/ocfs2/ocfs2_lockid.h | 5 + fs/ocfs2/quota_global.c | 4 +- fs/ocfs2/quota_local.c | 21 ++++-- fs/ocfs2/super.c | 66 ++++++++++++---- fs/ocfs2/xattr.c | 5 +- 17 files changed, 610 insertions(+), 96 deletions(-) -- Life's Little Instruction Book #99 "Think big thoughts, but relish small pleasures." Joel Becker Principal Sof...

...| 2 +- fs/ocfs2/file.c | 5 +- fs/ocfs2/journal.c | 8 ++- fs/ocfs2/journal.h | 19 ++++--- fs/ocfs2/ocfs2.h | 22 ++++++- fs/ocfs2/quota.h | 1 - fs/ocfs2/quota_global.c | 134 +++++++++++++++++++++++-------------------- fs/ocfs2/quota_local.c | 110 +++++++++++++++++++++++++++++++----- fs/ocfs2/stack_o2cb.c | 3 +- fs/ocfs2/super.c | 30 +++++++++- fs/ocfs2/xattr.c | 3 +- 16 files changed, 357 insertions(+), 135 deletions(-) -- Life's Little Instruction Book #99 "Think big thoughts...

...ter.c | 22 ++- fs/ocfs2/dlm/dlmrecovery.c | 2 +- fs/ocfs2/file.c | 309 +++++++++++++++++++++++++++++++++++--------- fs/ocfs2/file.h | 6 +- fs/ocfs2/journal.c | 30 ++-- fs/ocfs2/localalloc.c | 7 + fs/ocfs2/quota_global.c | 2 +- fs/ocfs2/quota_local.c | 4 +- fs/ocfs2/refcounttree.c | 12 ++ fs/ocfs2/suballoc.c | 2 +- fs/ocfs2/xattr.c | 200 +++++++++++++++++++--------- include/linux/jbd2.h | 11 +- 16 files changed, 504 insertions(+), 224 deletions(-)

...(-) delete mode 100644 fs/ocfs2/ver.c delete mode 100644 fs/ocfs2/ver.h diff --git a/fs/ocfs2/Makefile b/fs/ocfs2/Makefile index f17e58b..ce210d4 100644 --- a/fs/ocfs2/Makefile +++ b/fs/ocfs2/Makefile @@ -38,7 +38,6 @@ ocfs2-objs := \ symlink.o \ sysfile.o \ uptodate.o \ - ver.o \ quota_local.o \ quota_global.o \ xattr.o \ diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index c414929..a4382d1 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -68,7 +68,6 @@ #include "super.h" #include "sysfile.h" #include "uptodate.h" -#include "ver....

...- fs/ocfs2/localalloc.h | 3 + fs/ocfs2/mmap.c | 48 +-- fs/ocfs2/namei.c | 91 ++--- fs/ocfs2/ocfs2.h | 22 + fs/ocfs2/ocfs2_fs.h | 144 +++++- fs/ocfs2/quota_global.c | 4 +- fs/ocfs2/quota_local.c | 50 +-- fs/ocfs2/refcounttree.c | 74 ++-- fs/ocfs2/refcounttree.h | 4 +- fs/ocfs2/reservations.c | 847 ++++++++++++++++++++++++++++++++ fs/ocfs2/reservations.h | 159 ++++++ fs/ocfs2/resize.c | 19 +-...

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.

...glue.c | 4 extent_map.c | 14 file.c | 21 - inode.c | 80 ++++ inode.h | 20 - journal.c | 53 +-- journal.h | 70 ++-- localalloc.c | 12 namei.c | 37 +- ocfs2.h | 38 ++ quota_global.c | 5 quota_local.c | 16 resize.c | 16 slot_map.c | 10 suballoc.c | 35 +- super.c | 5 uptodate.c | 265 +++++++++------- uptodate.h | 51 ++- xattr.c | 81 ++-- 25 files changed, 1056 insertions(+), 809 deletions(-)