Move xen patchset to new version's subdir.

[people/teissler/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.suse / quota-Add-helpers-to-allow-ocfs2-specific-quota-ini.patch

diff --git a/src/patches/suse-2.6.27.31/patches.suse/quota-Add-helpers-to-allow-ocfs2-specific-quota-ini.patch b/src/patches/suse-2.6.27.31/patches.suse/quota-Add-helpers-to-allow-ocfs2-specific-quota-ini.patch
new file mode 100644 (file)
index 0000000..e092517
--- /dev/null
+++ b/src/patches/suse-2.6.27.31/patches.suse/quota-Add-helpers-to-allow-ocfs2-specific-quota-ini.patch
@@ -0,0 +1,125 @@
+From: Jan Kara <jack@suse.cz>
+References: fate#302681
+Subject: [PATCH 16/28] quota: Add helpers to allow ocfs2 specific quota initialization, freeing and recovery
+Patch-mainline: 2.6.29?
+
+OCFS2 needs to peek whether quota structure is already in memory so
+that it can avoid expensive cluster locking in that case. Similarly
+when freeing dquots, it checks whether it is the last quota structure
+user or not. Finally, it needs to get reference to dquot structure for
+specified id and quota type when recovering quota file after crash.
+
+Signed-off-by: Jan Kara <jack@suse.cz>
+---
+ fs/dquot.c               |   38 ++++++++++++++++++++++++++++++++------
+ include/linux/quotaops.h |    4 ++++
+ 2 files changed, 36 insertions(+), 6 deletions(-)
+
+diff --git a/fs/dquot.c b/fs/dquot.c
+index 3fde18b..9fb1d71 100644
+--- a/fs/dquot.c
++++ b/fs/dquot.c
+@@ -213,8 +213,6 @@ static struct hlist_head *dquot_hash;
+ 
+ struct dqstats dqstats;
+ 
+-static void dqput(struct dquot *dquot);
+-
+ static inline unsigned int
+ hashfn(const struct super_block *sb, unsigned int id, int type)
+ {
+@@ -568,7 +566,7 @@ static struct shrinker dqcache_shrinker = {
+  * NOTE: If you change this function please check whether dqput_blocks() works right...
+  * MUST be called with either dqptr_sem or dqonoff_mutex held
+  */
+-static void dqput(struct dquot *dquot)
++void dqput(struct dquot *dquot)
+ {
+       int ret;
+ 
+@@ -660,10 +658,28 @@ static struct dquot *get_empty_dquot(struct super_block *sb, int type)
+ }
+ 
+ /*
++ * Check whether dquot is in memory.
++ * MUST be called with either dqptr_sem or dqonoff_mutex held
++ */
++int dquot_is_cached(struct super_block *sb, unsigned int id, int type)
++{
++      unsigned int hashent = hashfn(sb, id, type);
++      int ret = 0;
++
++        if (!sb_has_quota_active(sb, type))
++              return 0;
++      spin_lock(&dq_list_lock);
++      if (find_dquot(hashent, sb, id, type) != NODQUOT)
++              ret = 1;
++      spin_unlock(&dq_list_lock);
++      return ret;
++}
++
++/*
+  * Get reference to dquot
+  * MUST be called with either dqptr_sem or dqonoff_mutex held
+  */
+-static struct dquot *dqget(struct super_block *sb, unsigned int id, int type)
++struct dquot *dqget(struct super_block *sb, unsigned int id, int type)
+ {
+       unsigned int hashent = hashfn(sb, id, type);
+       struct dquot *dquot, *empty = NODQUOT;
+@@ -1184,17 +1200,23 @@ out_err:
+  *    Release all quotas referenced by inode
+  *    Transaction must be started at an entry
+  */
+-int dquot_drop(struct inode *inode)
++int dquot_drop_locked(struct inode *inode)
+ {
+       int cnt;
+ 
+-      down_write(&sb_dqopt(inode->i_sb)->dqptr_sem);
+       for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
+               if (inode->i_dquot[cnt] != NODQUOT) {
+                       dqput(inode->i_dquot[cnt]);
+                       inode->i_dquot[cnt] = NODQUOT;
+               }
+       }
++      return 0;
++}
++
++int dquot_drop(struct inode *inode)
++{
++      down_write(&sb_dqopt(inode->i_sb)->dqptr_sem);
++      dquot_drop_locked(inode);
+       up_write(&sb_dqopt(inode->i_sb)->dqptr_sem);
+       return 0;
+ }
+@@ -2306,7 +2328,11 @@ EXPORT_SYMBOL(dquot_release);
+ EXPORT_SYMBOL(dquot_mark_dquot_dirty);
+ EXPORT_SYMBOL(dquot_initialize);
+ EXPORT_SYMBOL(dquot_drop);
++EXPORT_SYMBOL(dquot_drop_locked);
+ EXPORT_SYMBOL(vfs_dq_drop);
++EXPORT_SYMBOL(dqget);
++EXPORT_SYMBOL(dqput);
++EXPORT_SYMBOL(dquot_is_cached);
+ EXPORT_SYMBOL(dquot_alloc_space);
+ EXPORT_SYMBOL(dquot_alloc_inode);
+ EXPORT_SYMBOL(dquot_free_space);
+diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
+index 94f00ec..1f990f2 100644
+--- a/include/linux/quotaops.h
++++ b/include/linux/quotaops.h
+@@ -27,6 +27,10 @@ void sync_dquots(struct super_block *sb, int type);
+ 
+ int dquot_initialize(struct inode *inode, int type);
+ int dquot_drop(struct inode *inode);
++int dquot_drop_locked(struct inode *inode);
++struct dquot *dqget(struct super_block *sb, unsigned int id, int type);
++void dqput(struct dquot *dquot);
++int dquot_is_cached(struct super_block *sb, unsigned int id, int type);
+ 
+ int dquot_alloc_space(struct inode *inode, qsize_t number, int prealloc);
+ int dquot_alloc_inode(const struct inode *inode, qsize_t number);
+-- 
+1.5.2.4
+