Index: linux-2.6.28-rc2/fs/dquot.c
===================================================================
--- linux-2.6.28-rc2.orig/fs/dquot.c	2008-11-06 13:37:06.000000000 -0800
+++ linux-2.6.28-rc2/fs/dquot.c	2008-11-06 13:37:08.000000000 -0800
@@ -853,9 +853,9 @@ static int dquot_claim_reserved_space(st
 						qsize_t number)
 {
 	if (dquot->dq_dqb.dqb_rsvspace < number) {
-		printk("WARNING: reserved quota %llu is not enough for"
+		printk(KERN_WARNING "Reserved quota %llu is not enough for"
 			"request %llu bytes\n",
-			dquot->dq_dqb.dqb_rsvspace, number);
+			(unsigned long long)dquot->dq_dqb.dqb_rsvspace, number);
 		return 1;
 	}
 
@@ -1384,13 +1384,11 @@ void dquot_release_reserved_space(struct
 	struct dquot *dquot;
 
 	if (IS_NOQUOTA(inode))
-		return;
+		goto out;
 
 	down_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
-	if (IS_NOQUOTA(inode))	{
-		up_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
-		return;
-	}
+	if (IS_NOQUOTA(inode))
+		goto out_unlock;
 
 	/* Release reserved dquots */
 	for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
@@ -1399,7 +1397,11 @@ void dquot_release_reserved_space(struct
 			dquot->dq_dqb.dqb_rsvspace -= number;
 		}
 	}
+
+out_unlock:
 	up_read(&sb_dqopt(inode->i_sb)->dqptr_sem);
+out:
+	return;
 }
 
 /*
Index: linux-2.6.28-rc2/include/linux/quotaops.h
===================================================================
--- linux-2.6.28-rc2.orig/include/linux/quotaops.h	2008-11-06 13:37:06.000000000 -0800
+++ linux-2.6.28-rc2/include/linux/quotaops.h	2008-11-06 14:00:32.000000000 -0800
@@ -206,11 +206,10 @@ static inline int vfs_dq_alloc_inode(str
  */
 static inline int vfs_dq_claim_space(struct inode *inode, qsize_t nr)
 {
-	if (sb_any_quota_active(inode->i_sb)){
+	if (sb_any_quota_active(inode->i_sb)) {
 		if (inode->i_sb->dq_op->claim_space(inode, nr) == NO_QUOTA)
 			return 1;
-	}
-	else
+	} else
 		inode_add_bytes(inode, nr);
 
 	mark_inode_dirty(inode);
@@ -220,7 +219,8 @@ static inline int vfs_dq_claim_space(str
 /*
  * Release reserved (in-memory) quotas
  */
-static inline void vfs_dq_release_reservation_space(struct inode *inode, qsize_t nr)
+static inline
+void vfs_dq_release_reservation_space(struct inode *inode, qsize_t nr)
 {
 	if (sb_any_quota_active(inode->i_sb))
 		inode->i_sb->dq_op->release_rsv(inode, nr);
@@ -377,7 +377,8 @@ static inline int vfs_dq_claim_space(str
 	return vfs_dq_alloc_space(inode, nr);
 }
 
-static inline int vfs_dq_release_reservation_space(struct inode *inode, qsize_t nr)
+static inline
+int vfs_dq_release_reservation_space(struct inode *inode, qsize_t nr)
 {
 	return 0;
 }
@@ -429,12 +430,13 @@ static inline int vfs_dq_reserve_block(s
 static inline int vfs_dq_claim_block(struct inode *inode, qsize_t nr)
 {
 	return vfs_dq_claim_space(inode,
-			nr << inode->i_sb->s_blocksize_bits);
+			nr << inode->i_blkbits);
 }
 
-static inline void vfs_dq_release_reservation(struct inode *inode, qsize_t nr)
+static inline
+void vfs_dq_release_reservation(struct inode *inode, qsize_t nr)
 {
-	vfs_dq_release_reservation_space(inode, nr << inode->i_sb->s_blocksize_bits);
+	vfs_dq_release_reservation_space(inode, nr << inode->i_blkbits);
 }
 
 static inline void vfs_dq_free_block_nodirty(struct inode *inode, qsize_t nr)
Index: linux-2.6.28-rc2/include/linux/quota.h
===================================================================
--- linux-2.6.28-rc2.orig/include/linux/quota.h	2008-11-06 13:37:06.000000000 -0800
+++ linux-2.6.28-rc2/include/linux/quota.h	2008-11-06 13:37:08.000000000 -0800
@@ -292,9 +292,9 @@ struct dquot_operations {
 	int (*release_dquot) (struct dquot *);		/* Quota is going to be deleted from disk */
 	int (*mark_dirty) (struct dquot *);		/* Dquot is marked dirty */
 	int (*write_info) (struct super_block *, int);	/* Write of quota "superblock" */
-	int (*reserve_space) (struct inode *, qsize_t, int); /* reserve quota for delayed block allocation */
-	int (*claim_space) (struct inode *, qsize_t); /* claim reserved quota for delayed block allocation */
-	void (*release_rsv) (struct inode *, qsize_t); /* release reserved quota for delayed block allocation */
+	int (*reserve_space) (struct inode *, qsize_t, int); /* reserve quota for delayed alloc */
+	int (*claim_space) (struct inode *, qsize_t); /* claim reserved quota for delayed alloc */
+	void (*release_rsv) (struct inode *, qsize_t); /* release rsved quota for delayed alloc */
 };
 
 /* Operations handling requests from userspace */
