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

Commit c94d2a22 authored by Jan Kara's avatar Jan Kara
Browse files

jfs: 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>
Acked-by: default avatarDave Kleikamp <shaggy@austin.ibm.com>
parent bacfb7c2

fs/jfs/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ int jfs_setattr(struct dentry *dentry, struct iattr *iattr) 


	if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||

	    (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) {

		if (DQUOT_TRANSFER(inode, iattr))

		if (vfs_dq_transfer(inode, iattr))

			return -EDQUOT;

	}

fs/jfs/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -158,9 +158,9 @@ void jfs_delete_inode(struct inode *inode) 
		/*

		 * Free the inode from the quota allocation.

		 */

		DQUOT_INIT(inode);

		DQUOT_FREE_INODE(inode);

		DQUOT_DROP(inode);

		vfs_dq_init(inode);

		vfs_dq_free_inode(inode);

		vfs_dq_drop(inode);

	}



	clear_inode(inode);

fs/jfs/jfs_dtree.c

+9 −9
Original line number Diff line number Diff line
@@ -381,10 +381,10 @@ static u32 add_index(tid_t tid, struct inode *ip, s64 bn, int slot) 
		 * It's time to move the inline table to an external

		 * page and begin to build the xtree

		 */

		if (DQUOT_ALLOC_BLOCK(ip, sbi->nbperpage))

		if (vfs_dq_alloc_block(ip, sbi->nbperpage))

			goto clean_up;

		if (dbAlloc(ip, 0, sbi->nbperpage, &xaddr)) {

			DQUOT_FREE_BLOCK(ip, sbi->nbperpage);

			vfs_dq_free_block(ip, sbi->nbperpage);

			goto clean_up;

		}
@@ -408,7 +408,7 @@ static u32 add_index(tid_t tid, struct inode *ip, s64 bn, int slot) 
			memcpy(&jfs_ip->i_dirtable, temp_table,

			       sizeof (temp_table));

			dbFree(ip, xaddr, sbi->nbperpage);

			DQUOT_FREE_BLOCK(ip, sbi->nbperpage);

			vfs_dq_free_block(ip, sbi->nbperpage);

			goto clean_up;

		}

		ip->i_size = PSIZE;
@@ -1027,7 +1027,7 @@ static int dtSplitUp(tid_t tid, 
			n = xlen;



		/* Allocate blocks to quota. */

		if (DQUOT_ALLOC_BLOCK(ip, n)) {

		if (vfs_dq_alloc_block(ip, n)) {

			rc = -EDQUOT;

			goto extendOut;

		}
@@ -1308,7 +1308,7 @@ static int dtSplitUp(tid_t tid, 


	/* Rollback quota allocation */

	if (rc && quota_allocation)

		DQUOT_FREE_BLOCK(ip, quota_allocation);

		vfs_dq_free_block(ip, quota_allocation);



      dtSplitUp_Exit:
@@ -1369,7 +1369,7 @@ static int dtSplitPage(tid_t tid, struct inode *ip, struct dtsplit * split, 
		return -EIO;



	/* Allocate blocks to quota. */

	if (DQUOT_ALLOC_BLOCK(ip, lengthPXD(pxd))) {

	if (vfs_dq_alloc_block(ip, lengthPXD(pxd))) {

		release_metapage(rmp);

		return -EDQUOT;

	}
@@ -1916,7 +1916,7 @@ static int dtSplitRoot(tid_t tid, 
	rp = rmp->data;



	/* Allocate blocks to quota. */

	if (DQUOT_ALLOC_BLOCK(ip, lengthPXD(pxd))) {

	if (vfs_dq_alloc_block(ip, lengthPXD(pxd))) {

		release_metapage(rmp);

		return -EDQUOT;

	}
@@ -2287,7 +2287,7 @@ static int dtDeleteUp(tid_t tid, struct inode *ip, 
	xlen = lengthPXD(&fp->header.self);



	/* Free quota allocation. */

	DQUOT_FREE_BLOCK(ip, xlen);

	vfs_dq_free_block(ip, xlen);



	/* free/invalidate its buffer page */

	discard_metapage(fmp);
@@ -2363,7 +2363,7 @@ static int dtDeleteUp(tid_t tid, struct inode *ip, 
				xlen = lengthPXD(&p->header.self);



				/* Free quota allocation */

				DQUOT_FREE_BLOCK(ip, xlen);

				vfs_dq_free_block(ip, xlen);



				/* free/invalidate its buffer page */

				discard_metapage(mp);

fs/jfs/jfs_extent.c

+5 −5
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, bool abnr) 
	}



	/* Allocate blocks to quota. */

	if (DQUOT_ALLOC_BLOCK(ip, nxlen)) {

	if (vfs_dq_alloc_block(ip, nxlen)) {

		dbFree(ip, nxaddr, (s64) nxlen);

		mutex_unlock(&JFS_IP(ip)->commit_mutex);

		return -EDQUOT;
@@ -164,7 +164,7 @@ extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, bool abnr) 
	 */

	if (rc) {

		dbFree(ip, nxaddr, nxlen);

		DQUOT_FREE_BLOCK(ip, nxlen);

		vfs_dq_free_block(ip, nxlen);

		mutex_unlock(&JFS_IP(ip)->commit_mutex);

		return (rc);

	}
@@ -256,7 +256,7 @@ int extRealloc(struct inode *ip, s64 nxlen, xad_t * xp, bool abnr) 
		goto exit;



	/* Allocat blocks to quota. */

	if (DQUOT_ALLOC_BLOCK(ip, nxlen)) {

	if (vfs_dq_alloc_block(ip, nxlen)) {

		dbFree(ip, nxaddr, (s64) nxlen);

		mutex_unlock(&JFS_IP(ip)->commit_mutex);

		return -EDQUOT;
@@ -297,7 +297,7 @@ int extRealloc(struct inode *ip, s64 nxlen, xad_t * xp, bool abnr) 
		/* extend the extent */

		if ((rc = xtExtend(0, ip, xoff + xlen, (int) nextend, 0))) {

			dbFree(ip, xaddr + xlen, delta);

			DQUOT_FREE_BLOCK(ip, nxlen);

			vfs_dq_free_block(ip, nxlen);

			goto exit;

		}

	} else {
@@ -308,7 +308,7 @@ int extRealloc(struct inode *ip, s64 nxlen, xad_t * xp, bool abnr) 
		 */

		if ((rc = xtTailgate(0, ip, xoff, (int) ntail, nxaddr, 0))) {

			dbFree(ip, nxaddr, nxlen);

			DQUOT_FREE_BLOCK(ip, nxlen);

			vfs_dq_free_block(ip, nxlen);

			goto exit;

		}

	}

fs/jfs/jfs_inode.c

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode) 
	/*

	 * Allocate inode to quota.

	 */

	if (DQUOT_ALLOC_INODE(inode)) {

	if (vfs_dq_alloc_inode(inode)) {

		rc = -EDQUOT;

		goto fail_drop;

	}
@@ -162,7 +162,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode) 
	return inode;



fail_drop:

	DQUOT_DROP(inode);

	vfs_dq_drop(inode);

	inode->i_flags |= S_NOQUOTA;

fail_unlock:

	inode->i_nlink = 0;