Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77db4f25 authored by Jan Kara's avatar Jan Kara
Browse files

reiserfs: Use lowercase names of quota functions 



Use lowercase names of quota functions instead of old uppercase ones.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
CC: reiserfs-devel@vger.kernel.org
parent a269eb18

fs/reiserfs/bitmap.c

+8 −6
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static void _reiserfs_free_block(struct reiserfs_transaction_handle *th, 


	journal_mark_dirty(th, s, sbh);

	if (for_unformatted)

		DQUOT_FREE_BLOCK_NODIRTY(inode, 1);

		vfs_dq_free_block_nodirty(inode, 1);

}



void reiserfs_free_block(struct reiserfs_transaction_handle *th,
@@ -1055,7 +1055,7 @@ static inline int blocknrs_and_prealloc_arrays_from_search_start 
			       amount_needed, hint->inode->i_uid);

#endif

		quota_ret =

		    DQUOT_ALLOC_BLOCK_NODIRTY(hint->inode, amount_needed);

		    vfs_dq_alloc_block_nodirty(hint->inode, amount_needed);

		if (quota_ret)	/* Quota exceeded? */

			return QUOTA_EXCEEDED;

		if (hint->preallocate && hint->prealloc_size) {
@@ -1064,8 +1064,7 @@ static inline int blocknrs_and_prealloc_arrays_from_search_start 
				       "reiserquota: allocating (prealloc) %d blocks id=%u",

				       hint->prealloc_size, hint->inode->i_uid);

#endif

			quota_ret =

			    DQUOT_PREALLOC_BLOCK_NODIRTY(hint->inode,

			quota_ret = vfs_dq_prealloc_block_nodirty(hint->inode,

							 hint->prealloc_size);

			if (quota_ret)

				hint->preallocate = hint->prealloc_size = 0;
@@ -1098,7 +1097,10 @@ static inline int blocknrs_and_prealloc_arrays_from_search_start 
					       nr_allocated,

					       hint->inode->i_uid);

#endif

				DQUOT_FREE_BLOCK_NODIRTY(hint->inode, amount_needed + hint->prealloc_size - nr_allocated);	/* Free not allocated blocks */

				/* Free not allocated blocks */

				vfs_dq_free_block_nodirty(hint->inode,

					amount_needed + hint->prealloc_size -

					nr_allocated);

			}

			while (nr_allocated--)

				reiserfs_free_block(hint->th, hint->inode,
@@ -1129,7 +1131,7 @@ static inline int blocknrs_and_prealloc_arrays_from_search_start 
			       REISERFS_I(hint->inode)->i_prealloc_count,

			       hint->inode->i_uid);

#endif

		DQUOT_FREE_BLOCK_NODIRTY(hint->inode, amount_needed +

		vfs_dq_free_block_nodirty(hint->inode, amount_needed +

					 hint->prealloc_size - nr_allocated -

					 REISERFS_I(hint->inode)->

					 i_prealloc_count);

fs/reiserfs/inode.c

+5 −5
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ void reiserfs_delete_inode(struct inode *inode) 
		 * after delete_object so that quota updates go into the same transaction as

		 * stat data deletion */

		if (!err) 

			DQUOT_FREE_INODE(inode);

			vfs_dq_free_inode(inode);



		if (journal_end(&th, inode->i_sb, jbegin_count))

			goto out;
@@ -1763,7 +1763,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th, 


	BUG_ON(!th->t_trans_id);



	if (DQUOT_ALLOC_INODE(inode)) {

	if (vfs_dq_alloc_inode(inode)) {

		err = -EDQUOT;

		goto out_end_trans;

	}
@@ -1947,12 +1947,12 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th, 
	INODE_PKEY(inode)->k_objectid = 0;



	/* Quota change must be inside a transaction for journaling */

	DQUOT_FREE_INODE(inode);

	vfs_dq_free_inode(inode);



      out_end_trans:

	journal_end(th, th->t_super, th->t_blocks_allocated);

	/* Drop can be outside and it needs more credits so it's better to have it outside */

	DQUOT_DROP(inode);

	vfs_dq_drop(inode);

	inode->i_flags |= S_NOQUOTA;

	make_bad_inode(inode);
@@ -3119,7 +3119,7 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr) 
				if (error)

					goto out;

				error =

				    DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0;

				    vfs_dq_transfer(inode, attr) ? -EDQUOT : 0;

				if (error) {

					journal_end(&th, inode->i_sb,

						    jbegin_count);

fs/reiserfs/namei.c

+3 −3
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th, 
*/

static int drop_new_inode(struct inode *inode)

{

	DQUOT_DROP(inode);

	vfs_dq_drop(inode);

	make_bad_inode(inode);

	inode->i_flags |= S_NOQUOTA;

	iput(inode);
@@ -563,7 +563,7 @@ static int drop_new_inode(struct inode *inode) 
}



/* utility function that does setup for reiserfs_new_inode.  

** DQUOT_INIT needs lots of credits so it's better to have it

** vfs_dq_init needs lots of credits so it's better to have it

** outside of a transaction, so we had to pull some bits of

** reiserfs_new_inode out into this func.

*/
@@ -586,7 +586,7 @@ static int new_inode_init(struct inode *inode, struct inode *dir, int mode) 
	} else {

		inode->i_gid = current_fsgid();

	}

	DQUOT_INIT(inode);

	vfs_dq_init(inode);

	return 0;

}

fs/reiserfs/stree.c

+7 −7
Original line number Diff line number Diff line
@@ -1297,7 +1297,7 @@ int reiserfs_delete_item(struct reiserfs_transaction_handle *th, struct treepath 
		       "reiserquota delete_item(): freeing %u, id=%u type=%c",

		       quota_cut_bytes, p_s_inode->i_uid, head2type(&s_ih));

#endif

	DQUOT_FREE_SPACE_NODIRTY(p_s_inode, quota_cut_bytes);

	vfs_dq_free_space_nodirty(p_s_inode, quota_cut_bytes);



	/* Return deleted body length */

	return n_ret_value;
@@ -1383,7 +1383,7 @@ void reiserfs_delete_solid_item(struct reiserfs_transaction_handle *th, 
					       quota_cut_bytes, inode->i_uid,

					       key2type(key));

#endif

				DQUOT_FREE_SPACE_NODIRTY(inode,

				vfs_dq_free_space_nodirty(inode,

							 quota_cut_bytes);

			}

			break;
@@ -1734,7 +1734,7 @@ int reiserfs_cut_from_item(struct reiserfs_transaction_handle *th, 
		       "reiserquota cut_from_item(): freeing %u id=%u type=%c",

		       quota_cut_bytes, p_s_inode->i_uid, '?');

#endif

	DQUOT_FREE_SPACE_NODIRTY(p_s_inode, quota_cut_bytes);

	vfs_dq_free_space_nodirty(p_s_inode, quota_cut_bytes);

	return n_ret_value;

}
@@ -1971,7 +1971,7 @@ int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th, struct tree 
		       key2type(&(p_s_key->on_disk_key)));

#endif



	if (DQUOT_ALLOC_SPACE_NODIRTY(inode, n_pasted_size)) {

	if (vfs_dq_alloc_space_nodirty(inode, n_pasted_size)) {

		pathrelse(p_s_search_path);

		return -EDQUOT;

	}
@@ -2027,7 +2027,7 @@ int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th, struct tree 
		       n_pasted_size, inode->i_uid,

		       key2type(&(p_s_key->on_disk_key)));

#endif

	DQUOT_FREE_SPACE_NODIRTY(inode, n_pasted_size);

	vfs_dq_free_space_nodirty(inode, n_pasted_size);

	return retval;

}
@@ -2060,7 +2060,7 @@ int reiserfs_insert_item(struct reiserfs_transaction_handle *th, struct treepath 
#endif

		/* We can't dirty inode here. It would be immediately written but

		 * appropriate stat item isn't inserted yet... */

		if (DQUOT_ALLOC_SPACE_NODIRTY(inode, quota_bytes)) {

		if (vfs_dq_alloc_space_nodirty(inode, quota_bytes)) {

			pathrelse(p_s_path);

			return -EDQUOT;

		}
@@ -2112,6 +2112,6 @@ int reiserfs_insert_item(struct reiserfs_transaction_handle *th, struct treepath 
		       quota_bytes, inode->i_uid, head2type(p_s_ih));

#endif

	if (inode)

		DQUOT_FREE_SPACE_NODIRTY(inode, quota_bytes);

		vfs_dq_free_space_nodirty(inode, quota_bytes);

	return retval;

}

fs/reiserfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static int finish_unfinished(struct super_block *s) 
			retval = remove_save_link_only(s, &save_link_key, 0);

			continue;

		}

		DQUOT_INIT(inode);

		vfs_dq_init(inode);



		if (truncate && S_ISDIR(inode->i_mode)) {

			/* We got a truncate request for a dir which is impossible.