diff options
Diffstat (limited to 'fs/xfs/xfs_ialloc.c')
-rw-r--r-- | fs/xfs/xfs_ialloc.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c index cb907ba69c4c..303a3fe7e0fc 100644 --- a/fs/xfs/xfs_ialloc.c +++ b/fs/xfs/xfs_ialloc.c | |||
@@ -382,9 +382,9 @@ xfs_ialloc_ag_alloc( | |||
382 | newino = XFS_OFFBNO_TO_AGINO(args.mp, args.agbno, 0); | 382 | newino = XFS_OFFBNO_TO_AGINO(args.mp, args.agbno, 0); |
383 | be32_add_cpu(&agi->agi_count, newlen); | 383 | be32_add_cpu(&agi->agi_count, newlen); |
384 | be32_add_cpu(&agi->agi_freecount, newlen); | 384 | be32_add_cpu(&agi->agi_freecount, newlen); |
385 | down_read(&args.mp->m_peraglock); | 385 | anon_down_read(&args.mp->m_peraglock); |
386 | args.mp->m_perag[agno].pagi_freecount += newlen; | 386 | args.mp->m_perag[agno].pagi_freecount += newlen; |
387 | up_read(&args.mp->m_peraglock); | 387 | anon_up_read(&args.mp->m_peraglock); |
388 | agi->agi_newino = cpu_to_be32(newino); | 388 | agi->agi_newino = cpu_to_be32(newino); |
389 | 389 | ||
390 | /* | 390 | /* |
@@ -486,7 +486,7 @@ xfs_ialloc_ag_select( | |||
486 | */ | 486 | */ |
487 | agno = pagno; | 487 | agno = pagno; |
488 | flags = XFS_ALLOC_FLAG_TRYLOCK; | 488 | flags = XFS_ALLOC_FLAG_TRYLOCK; |
489 | down_read(&mp->m_peraglock); | 489 | anon_down_read(&mp->m_peraglock); |
490 | for (;;) { | 490 | for (;;) { |
491 | pag = &mp->m_perag[agno]; | 491 | pag = &mp->m_perag[agno]; |
492 | if (!pag->pagi_init) { | 492 | if (!pag->pagi_init) { |
@@ -527,7 +527,7 @@ xfs_ialloc_ag_select( | |||
527 | agbp = NULL; | 527 | agbp = NULL; |
528 | goto nextag; | 528 | goto nextag; |
529 | } | 529 | } |
530 | up_read(&mp->m_peraglock); | 530 | anon_up_read(&mp->m_peraglock); |
531 | return agbp; | 531 | return agbp; |
532 | } | 532 | } |
533 | } | 533 | } |
@@ -540,7 +540,7 @@ nextag: | |||
540 | * down. | 540 | * down. |
541 | */ | 541 | */ |
542 | if (XFS_FORCED_SHUTDOWN(mp)) { | 542 | if (XFS_FORCED_SHUTDOWN(mp)) { |
543 | up_read(&mp->m_peraglock); | 543 | anon_up_read(&mp->m_peraglock); |
544 | return NULL; | 544 | return NULL; |
545 | } | 545 | } |
546 | agno++; | 546 | agno++; |
@@ -548,7 +548,7 @@ nextag: | |||
548 | agno = 0; | 548 | agno = 0; |
549 | if (agno == pagno) { | 549 | if (agno == pagno) { |
550 | if (flags == 0) { | 550 | if (flags == 0) { |
551 | up_read(&mp->m_peraglock); | 551 | anon_up_read(&mp->m_peraglock); |
552 | return NULL; | 552 | return NULL; |
553 | } | 553 | } |
554 | flags = 0; | 554 | flags = 0; |
@@ -771,13 +771,13 @@ nextag: | |||
771 | *inop = NULLFSINO; | 771 | *inop = NULLFSINO; |
772 | return noroom ? ENOSPC : 0; | 772 | return noroom ? ENOSPC : 0; |
773 | } | 773 | } |
774 | down_read(&mp->m_peraglock); | 774 | anon_down_read(&mp->m_peraglock); |
775 | if (mp->m_perag[tagno].pagi_inodeok == 0) { | 775 | if (mp->m_perag[tagno].pagi_inodeok == 0) { |
776 | up_read(&mp->m_peraglock); | 776 | anon_up_read(&mp->m_peraglock); |
777 | goto nextag; | 777 | goto nextag; |
778 | } | 778 | } |
779 | error = xfs_ialloc_read_agi(mp, tp, tagno, &agbp); | 779 | error = xfs_ialloc_read_agi(mp, tp, tagno, &agbp); |
780 | up_read(&mp->m_peraglock); | 780 | anon_up_read(&mp->m_peraglock); |
781 | if (error) | 781 | if (error) |
782 | goto nextag; | 782 | goto nextag; |
783 | agi = XFS_BUF_TO_AGI(agbp); | 783 | agi = XFS_BUF_TO_AGI(agbp); |
@@ -1006,9 +1006,9 @@ alloc_inode: | |||
1006 | goto error0; | 1006 | goto error0; |
1007 | be32_add_cpu(&agi->agi_freecount, -1); | 1007 | be32_add_cpu(&agi->agi_freecount, -1); |
1008 | xfs_ialloc_log_agi(tp, agbp, XFS_AGI_FREECOUNT); | 1008 | xfs_ialloc_log_agi(tp, agbp, XFS_AGI_FREECOUNT); |
1009 | down_read(&mp->m_peraglock); | 1009 | anon_down_read(&mp->m_peraglock); |
1010 | mp->m_perag[tagno].pagi_freecount--; | 1010 | mp->m_perag[tagno].pagi_freecount--; |
1011 | up_read(&mp->m_peraglock); | 1011 | anon_up_read(&mp->m_peraglock); |
1012 | 1012 | ||
1013 | error = xfs_check_agi_freecount(cur, agi); | 1013 | error = xfs_check_agi_freecount(cur, agi); |
1014 | if (error) | 1014 | if (error) |
@@ -1088,9 +1088,9 @@ xfs_difree( | |||
1088 | /* | 1088 | /* |
1089 | * Get the allocation group header. | 1089 | * Get the allocation group header. |
1090 | */ | 1090 | */ |
1091 | down_read(&mp->m_peraglock); | 1091 | anon_down_read(&mp->m_peraglock); |
1092 | error = xfs_ialloc_read_agi(mp, tp, agno, &agbp); | 1092 | error = xfs_ialloc_read_agi(mp, tp, agno, &agbp); |
1093 | up_read(&mp->m_peraglock); | 1093 | anon_up_read(&mp->m_peraglock); |
1094 | if (error) { | 1094 | if (error) { |
1095 | cmn_err(CE_WARN, | 1095 | cmn_err(CE_WARN, |
1096 | "xfs_difree: xfs_ialloc_read_agi() returned an error %d on %s. Returning error.", | 1096 | "xfs_difree: xfs_ialloc_read_agi() returned an error %d on %s. Returning error.", |
@@ -1157,9 +1157,9 @@ xfs_difree( | |||
1157 | be32_add_cpu(&agi->agi_count, -ilen); | 1157 | be32_add_cpu(&agi->agi_count, -ilen); |
1158 | be32_add_cpu(&agi->agi_freecount, -(ilen - 1)); | 1158 | be32_add_cpu(&agi->agi_freecount, -(ilen - 1)); |
1159 | xfs_ialloc_log_agi(tp, agbp, XFS_AGI_COUNT | XFS_AGI_FREECOUNT); | 1159 | xfs_ialloc_log_agi(tp, agbp, XFS_AGI_COUNT | XFS_AGI_FREECOUNT); |
1160 | down_read(&mp->m_peraglock); | 1160 | anon_down_read(&mp->m_peraglock); |
1161 | mp->m_perag[agno].pagi_freecount -= ilen - 1; | 1161 | mp->m_perag[agno].pagi_freecount -= ilen - 1; |
1162 | up_read(&mp->m_peraglock); | 1162 | anon_up_read(&mp->m_peraglock); |
1163 | xfs_trans_mod_sb(tp, XFS_TRANS_SB_ICOUNT, -ilen); | 1163 | xfs_trans_mod_sb(tp, XFS_TRANS_SB_ICOUNT, -ilen); |
1164 | xfs_trans_mod_sb(tp, XFS_TRANS_SB_IFREE, -(ilen - 1)); | 1164 | xfs_trans_mod_sb(tp, XFS_TRANS_SB_IFREE, -(ilen - 1)); |
1165 | 1165 | ||
@@ -1188,9 +1188,9 @@ xfs_difree( | |||
1188 | */ | 1188 | */ |
1189 | be32_add_cpu(&agi->agi_freecount, 1); | 1189 | be32_add_cpu(&agi->agi_freecount, 1); |
1190 | xfs_ialloc_log_agi(tp, agbp, XFS_AGI_FREECOUNT); | 1190 | xfs_ialloc_log_agi(tp, agbp, XFS_AGI_FREECOUNT); |
1191 | down_read(&mp->m_peraglock); | 1191 | anon_down_read(&mp->m_peraglock); |
1192 | mp->m_perag[agno].pagi_freecount++; | 1192 | mp->m_perag[agno].pagi_freecount++; |
1193 | up_read(&mp->m_peraglock); | 1193 | anon_up_read(&mp->m_peraglock); |
1194 | xfs_trans_mod_sb(tp, XFS_TRANS_SB_IFREE, 1); | 1194 | xfs_trans_mod_sb(tp, XFS_TRANS_SB_IFREE, 1); |
1195 | } | 1195 | } |
1196 | 1196 | ||
@@ -1312,9 +1312,9 @@ xfs_imap( | |||
1312 | xfs_buf_t *agbp; /* agi buffer */ | 1312 | xfs_buf_t *agbp; /* agi buffer */ |
1313 | int i; /* temp state */ | 1313 | int i; /* temp state */ |
1314 | 1314 | ||
1315 | down_read(&mp->m_peraglock); | 1315 | anon_down_read(&mp->m_peraglock); |
1316 | error = xfs_ialloc_read_agi(mp, tp, agno, &agbp); | 1316 | error = xfs_ialloc_read_agi(mp, tp, agno, &agbp); |
1317 | up_read(&mp->m_peraglock); | 1317 | anon_up_read(&mp->m_peraglock); |
1318 | if (error) { | 1318 | if (error) { |
1319 | xfs_fs_cmn_err(CE_ALERT, mp, "xfs_imap: " | 1319 | xfs_fs_cmn_err(CE_ALERT, mp, "xfs_imap: " |
1320 | "xfs_ialloc_read_agi() returned " | 1320 | "xfs_ialloc_read_agi() returned " |