patch-2.3.30 linux/include/linux/quotaops.h

• Lines: 58
• Date: Mon Dec 6 17:22:08 1999
• Orig file: v2.3.29/linux/include/linux/quotaops.h
• Orig date: Thu Nov 18 20:25:38 1999

diff -u --recursive --new-file v2.3.29/linux/include/linux/quotaops.h linux/include/linux/quotaops.h
@@ -23,16 +23,13 @@
 extern int  quota_off(kdev_t dev, short type);
 extern int  sync_dquots(kdev_t dev, short type);
 
-extern int  dquot_alloc_block(const struct inode *inode, unsigned long number,
-                              uid_t initiator, char warn);
-extern int  dquot_alloc_inode(const struct inode *inode, unsigned long number,
-                              uid_t initiator);
+extern int  dquot_alloc_block(const struct inode *inode, unsigned long number, char prealloc);
+extern int  dquot_alloc_inode(const struct inode *inode, unsigned long number);
 
 extern void dquot_free_block(const struct inode *inode, unsigned long number);
 extern void dquot_free_inode(const struct inode *inode, unsigned long number);
 
-extern int  dquot_transfer(struct dentry *dentry, struct iattr *iattr,
-                           uid_t initiator);
+extern int  dquot_transfer(struct dentry *dentry, struct iattr *iattr);
 
 /*
  * Operations supported for diskquotas.
@@ -54,8 +51,7 @@
 extern __inline__ int DQUOT_PREALLOC_BLOCK(struct super_block *sb, const struct inode *inode, int nr)
 {
 	if (sb->dq_op) {
-		if (sb->dq_op->alloc_block(inode, fs_to_dq_blocks(nr, sb->s_blocksize),
-					   current->fsuid, 0) == NO_QUOTA)
+		if (sb->dq_op->alloc_block(inode, fs_to_dq_blocks(nr, sb->s_blocksize), 1) == NO_QUOTA)
 			return 1;
 	}
 	return 0;
@@ -64,8 +60,7 @@
 extern __inline__ int DQUOT_ALLOC_BLOCK(struct super_block *sb, const struct inode *inode, int nr)
 {
 	if (sb->dq_op) {
-		if (sb->dq_op->alloc_block(inode, fs_to_dq_blocks(nr, sb->s_blocksize),
-					   current->fsuid, 1) == NO_QUOTA)
+		if (sb->dq_op->alloc_block(inode, fs_to_dq_blocks(nr, sb->s_blocksize), 0) == NO_QUOTA)
 			return 1;
 	}
 	return 0;
@@ -75,7 +70,7 @@
 {
 	if (sb->dq_op) {
 		sb->dq_op->initialize (inode, -1);
-		if (sb->dq_op->alloc_inode (inode, 1, current->fsuid))
+		if (sb->dq_op->alloc_inode (inode, 1))
 			return 1;
 	}
 	inode->i_flags |= S_QUOTA;
@@ -100,7 +95,7 @@
 
 	if (dentry->d_inode->i_sb->dq_op) {
 		dentry->d_inode->i_sb->dq_op->initialize(dentry->d_inode, -1);
-		error = dentry->d_inode->i_sb->dq_op->transfer(dentry, iattr, current->fsuid);
+		error = dentry->d_inode->i_sb->dq_op->transfer(dentry, iattr);
 	} else {
 		error = notify_change(dentry, iattr);
 	}