From eeb3370529bd90fbcd339d8e36acda3fd75c871b Mon Sep 17 00:00:00 2001 From: dann frazier Date: Sat, 3 Apr 2010 18:38:24 +0000 Subject: [PATCH] adjust to apply on top of 2.6.32.11 svn path=/dists/sid/linux-2.6/; revision=15475 --- .../features/all/vserver/vs2.3.0.36.27.patch | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/debian/patches/features/all/vserver/vs2.3.0.36.27.patch b/debian/patches/features/all/vserver/vs2.3.0.36.27.patch index 4cb9ace35..fee432e48 100644 --- a/debian/patches/features/all/vserver/vs2.3.0.36.27.patch +++ b/debian/patches/features/all/vserver/vs2.3.0.36.27.patch @@ -8965,7 +8965,7 @@ diff -NurpP --minimal linux-2.6.32.1/include/linux/quotaops.h linux-2.6.32.1-vs2 static inline struct quota_info *sb_dqopt(struct super_block *sb) { -@@ -154,10 +155,14 @@ static inline void vfs_dq_init(struct in +@@ -157,10 +158,14 @@ static inline void vfs_dq_init(struct in * a transaction (deadlocks possible otherwise) */ static inline int vfs_dq_prealloc_space_nodirty(struct inode *inode, qsize_t nr) { @@ -8981,7 +8981,7 @@ diff -NurpP --minimal linux-2.6.32.1/include/linux/quotaops.h linux-2.6.32.1-vs2 } else inode_add_bytes(inode, nr); -@@ -174,10 +179,14 @@ static inline int vfs_dq_prealloc_space( +@@ -177,10 +182,14 @@ static inline int vfs_dq_prealloc_space( static inline int vfs_dq_alloc_space_nodirty(struct inode *inode, qsize_t nr) { @@ -8997,7 +8997,7 @@ diff -NurpP --minimal linux-2.6.32.1/include/linux/quotaops.h linux-2.6.32.1-vs2 } else inode_add_bytes(inode, nr); -@@ -194,20 +203,28 @@ static inline int vfs_dq_alloc_space(str +@@ -197,10 +206,14 @@ static inline int vfs_dq_alloc_space(str static inline int vfs_dq_reserve_space(struct inode *inode, qsize_t nr) { @@ -9011,8 +9011,9 @@ diff -NurpP --minimal linux-2.6.32.1/include/linux/quotaops.h linux-2.6.32.1-vs2 return 1; + } } - return 0; - } + else + inode_add_rsv_space(inode, nr); +@@ -209,10 +222,14 @@ static inline int vfs_dq_reserve_space(s static inline int vfs_dq_alloc_inode(struct inode *inode) { @@ -9028,7 +9029,7 @@ diff -NurpP --minimal linux-2.6.32.1/include/linux/quotaops.h linux-2.6.32.1-vs2 } return 0; } -@@ -217,9 +234,13 @@ static inline int vfs_dq_alloc_inode(str +@@ -222,9 +239,13 @@ static inline int vfs_dq_alloc_inode(str */ static inline int vfs_dq_claim_space(struct inode *inode, qsize_t nr) { @@ -9041,17 +9042,17 @@ diff -NurpP --minimal linux-2.6.32.1/include/linux/quotaops.h linux-2.6.32.1-vs2 return 1; + } } else - inode_add_bytes(inode, nr); + inode_claim_rsv_space(inode, nr); -@@ -235,6 +256,7 @@ void vfs_dq_release_reservation_space(st - { - if (sb_any_quota_active(inode->i_sb)) +@@ -242,6 +263,7 @@ void vfs_dq_release_reservation_space(st inode->i_sb->dq_op->release_rsv(inode, nr); + else + inode_sub_rsv_space(inode, nr); + dl_release_space(inode, nr); } static inline void vfs_dq_free_space_nodirty(struct inode *inode, qsize_t nr) -@@ -243,6 +265,7 @@ static inline void vfs_dq_free_space_nod +@@ -250,6 +272,7 @@ static inline void vfs_dq_free_space_nod inode->i_sb->dq_op->free_space(inode, nr); else inode_sub_bytes(inode, nr); @@ -9059,7 +9060,7 @@ diff -NurpP --minimal linux-2.6.32.1/include/linux/quotaops.h linux-2.6.32.1-vs2 } static inline void vfs_dq_free_space(struct inode *inode, qsize_t nr) -@@ -255,6 +278,7 @@ static inline void vfs_dq_free_inode(str +@@ -262,6 +285,7 @@ static inline void vfs_dq_free_inode(str { if (sb_any_quota_active(inode->i_sb)) inode->i_sb->dq_op->free_inode(inode, 1); @@ -9067,7 +9068,7 @@ diff -NurpP --minimal linux-2.6.32.1/include/linux/quotaops.h linux-2.6.32.1-vs2 } /* Cannot be called inside a transaction */ -@@ -358,6 +382,8 @@ static inline int vfs_dq_transfer(struct +@@ -365,6 +389,8 @@ static inline int vfs_dq_transfer(struct static inline int vfs_dq_prealloc_space_nodirty(struct inode *inode, qsize_t nr) { @@ -9076,7 +9077,7 @@ diff -NurpP --minimal linux-2.6.32.1/include/linux/quotaops.h linux-2.6.32.1-vs2 inode_add_bytes(inode, nr); return 0; } -@@ -371,6 +397,8 @@ static inline int vfs_dq_prealloc_space( +@@ -378,6 +404,8 @@ static inline int vfs_dq_prealloc_space( static inline int vfs_dq_alloc_space_nodirty(struct inode *inode, qsize_t nr) { @@ -9085,7 +9086,7 @@ diff -NurpP --minimal linux-2.6.32.1/include/linux/quotaops.h linux-2.6.32.1-vs2 inode_add_bytes(inode, nr); return 0; } -@@ -384,22 +412,28 @@ static inline int vfs_dq_alloc_space(str +@@ -391,22 +419,28 @@ static inline int vfs_dq_alloc_space(str static inline int vfs_dq_reserve_space(struct inode *inode, qsize_t nr) {