diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 16:07:54 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 16:07:54 -0500 |
commit | 1619ed8f60959829d070d8f39cd2f8ca0e7135ce (patch) | |
tree | aa2599110827affb10e64a12e85a9d11f45854b1 /fs/gfs2/super.c | |
parent | 29ad0de279002f9b6a63df5ba85328f5b633b842 (diff) | |
parent | 46cc1e5fce46e71f27e542125e045827a6bb776e (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
GFS2: local functions should be static
GFS2: We only need one ACL getting function
GFS2: Fix multi-block allocation
GFS2: decouple quota allocations from block allocations
GFS2: split function rgblk_search
GFS2: Fix up "off by one" in the previous patch
GFS2: move toward a generic multi-block allocator
GFS2: O_(D)SYNC support for fallocate
GFS2: remove vestigial al_alloced
GFS2: combine gfs2_alloc_block and gfs2_alloc_di
GFS2: Add non-try locks back to get_local_rgrp
GFS2: f_ra is always valid in dir readahead function
GFS2: Fix very unlikley memory leak in ACL xattr code
GFS2: More automated code analysis fixes
GFS2: Add readahead to sequential directory traversal
GFS2: Fix up REQ flags
Diffstat (limited to 'fs/gfs2/super.c')
-rw-r--r-- | fs/gfs2/super.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 10c7733a899b..4553ce515f62 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c | |||
@@ -1399,8 +1399,9 @@ static void gfs2_final_release_pages(struct gfs2_inode *ip) | |||
1399 | static int gfs2_dinode_dealloc(struct gfs2_inode *ip) | 1399 | static int gfs2_dinode_dealloc(struct gfs2_inode *ip) |
1400 | { | 1400 | { |
1401 | struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode); | 1401 | struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode); |
1402 | struct gfs2_alloc *al; | 1402 | struct gfs2_qadata *qa; |
1403 | struct gfs2_rgrpd *rgd; | 1403 | struct gfs2_rgrpd *rgd; |
1404 | struct gfs2_holder gh; | ||
1404 | int error; | 1405 | int error; |
1405 | 1406 | ||
1406 | if (gfs2_get_inode_blocks(&ip->i_inode) != 1) { | 1407 | if (gfs2_get_inode_blocks(&ip->i_inode) != 1) { |
@@ -1408,8 +1409,8 @@ static int gfs2_dinode_dealloc(struct gfs2_inode *ip) | |||
1408 | return -EIO; | 1409 | return -EIO; |
1409 | } | 1410 | } |
1410 | 1411 | ||
1411 | al = gfs2_alloc_get(ip); | 1412 | qa = gfs2_qadata_get(ip); |
1412 | if (!al) | 1413 | if (!qa) |
1413 | return -ENOMEM; | 1414 | return -ENOMEM; |
1414 | 1415 | ||
1415 | error = gfs2_quota_hold(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE); | 1416 | error = gfs2_quota_hold(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE); |
@@ -1423,8 +1424,7 @@ static int gfs2_dinode_dealloc(struct gfs2_inode *ip) | |||
1423 | goto out_qs; | 1424 | goto out_qs; |
1424 | } | 1425 | } |
1425 | 1426 | ||
1426 | error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, | 1427 | error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, &gh); |
1427 | &al->al_rgd_gh); | ||
1428 | if (error) | 1428 | if (error) |
1429 | goto out_qs; | 1429 | goto out_qs; |
1430 | 1430 | ||
@@ -1440,11 +1440,11 @@ static int gfs2_dinode_dealloc(struct gfs2_inode *ip) | |||
1440 | gfs2_trans_end(sdp); | 1440 | gfs2_trans_end(sdp); |
1441 | 1441 | ||
1442 | out_rg_gunlock: | 1442 | out_rg_gunlock: |
1443 | gfs2_glock_dq_uninit(&al->al_rgd_gh); | 1443 | gfs2_glock_dq_uninit(&gh); |
1444 | out_qs: | 1444 | out_qs: |
1445 | gfs2_quota_unhold(ip); | 1445 | gfs2_quota_unhold(ip); |
1446 | out: | 1446 | out: |
1447 | gfs2_alloc_put(ip); | 1447 | gfs2_qadata_put(ip); |
1448 | return error; | 1448 | return error; |
1449 | } | 1449 | } |
1450 | 1450 | ||