Signed-off-by: Malcolm Parsons <malcolm.parsons@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Malcolm Parsons 2009-03-29 09:55:42 +02:00 коммит произвёл Christoph Hellwig
Родитель bddaafa11a
Коммит 9da096fd13
22 изменённых файлов: 40 добавлений и 40 удалений

Просмотреть файл

@ -2479,7 +2479,7 @@ xfs_bmap_adjacent(
fb_agno = nullfb ? NULLAGNUMBER : XFS_FSB_TO_AGNO(mp, ap->firstblock); fb_agno = nullfb ? NULLAGNUMBER : XFS_FSB_TO_AGNO(mp, ap->firstblock);
/* /*
* If allocating at eof, and there's a previous real block, * If allocating at eof, and there's a previous real block,
* try to use it's last block as our starting point. * try to use its last block as our starting point.
*/ */
if (ap->eof && ap->prevp->br_startoff != NULLFILEOFF && if (ap->eof && ap->prevp->br_startoff != NULLFILEOFF &&
!isnullstartblock(ap->prevp->br_startblock) && !isnullstartblock(ap->prevp->br_startblock) &&
@ -4796,7 +4796,7 @@ xfs_bmapi(
xfs_extlen_t minlen; /* min allocation size */ xfs_extlen_t minlen; /* min allocation size */
xfs_mount_t *mp; /* xfs mount structure */ xfs_mount_t *mp; /* xfs mount structure */
int n; /* current extent index */ int n; /* current extent index */
int nallocs; /* number of extents alloc\'d */ int nallocs; /* number of extents alloc'd */
xfs_extnum_t nextents; /* number of extents in file */ xfs_extnum_t nextents; /* number of extents in file */
xfs_fileoff_t obno; /* old block number (offset) */ xfs_fileoff_t obno; /* old block number (offset) */
xfs_bmbt_irec_t prev; /* previous file extent record */ xfs_bmbt_irec_t prev; /* previous file extent record */
@ -6486,7 +6486,7 @@ xfs_bmap_count_tree(
block = XFS_BUF_TO_BLOCK(bp); block = XFS_BUF_TO_BLOCK(bp);
if (--level) { if (--level) {
/* Not at node above leafs, count this level of nodes */ /* Not at node above leaves, count this level of nodes */
nextbno = be64_to_cpu(block->bb_u.l.bb_rightsib); nextbno = be64_to_cpu(block->bb_u.l.bb_rightsib);
while (nextbno != NULLFSBLOCK) { while (nextbno != NULLFSBLOCK) {
if ((error = xfs_btree_read_bufl(mp, tp, nextbno, if ((error = xfs_btree_read_bufl(mp, tp, nextbno,

Просмотреть файл

@ -125,7 +125,7 @@ typedef struct xfs_bmalloca {
struct xfs_bmbt_irec *gotp; /* extent after, or delayed */ struct xfs_bmbt_irec *gotp; /* extent after, or delayed */
xfs_extlen_t alen; /* i/o length asked/allocated */ xfs_extlen_t alen; /* i/o length asked/allocated */
xfs_extlen_t total; /* total blocks needed for xaction */ xfs_extlen_t total; /* total blocks needed for xaction */
xfs_extlen_t minlen; /* mininum allocation size (blocks) */ xfs_extlen_t minlen; /* minimum allocation size (blocks) */
xfs_extlen_t minleft; /* amount must be left after alloc */ xfs_extlen_t minleft; /* amount must be left after alloc */
char eof; /* set if allocating past last extent */ char eof; /* set if allocating past last extent */
char wasdel; /* replacing a delayed allocation */ char wasdel; /* replacing a delayed allocation */

Просмотреть файл

@ -1883,7 +1883,7 @@ xfs_btree_lshift(
/* /*
* We add one entry to the left side and remove one for the right side. * We add one entry to the left side and remove one for the right side.
* Accout for it here, the changes will be updated on disk and logged * Account for it here, the changes will be updated on disk and logged
* later. * later.
*/ */
lrecs++; lrecs++;
@ -3535,7 +3535,7 @@ xfs_btree_delrec(
XFS_BTREE_STATS_INC(cur, join); XFS_BTREE_STATS_INC(cur, join);
/* /*
* Fix up the the number of records and right block pointer in the * Fix up the number of records and right block pointer in the
* surviving block, and log it. * surviving block, and log it.
*/ */
xfs_btree_set_numrecs(left, lrecs + rrecs); xfs_btree_set_numrecs(left, lrecs + rrecs);

Просмотреть файл

@ -41,7 +41,7 @@ extern kmem_zone_t *xfs_btree_cur_zone;
/* /*
* Generic btree header. * Generic btree header.
* *
* This is a comination of the actual format used on disk for short and long * This is a combination of the actual format used on disk for short and long
* format btrees. The first three fields are shared by both format, but * format btrees. The first three fields are shared by both format, but
* the pointers are different and should be used with care. * the pointers are different and should be used with care.
* *

Просмотреть файл

@ -185,7 +185,7 @@ typedef struct xfs_da_state {
unsigned char inleaf; /* insert into 1->lf, 0->splf */ unsigned char inleaf; /* insert into 1->lf, 0->splf */
unsigned char extravalid; /* T/F: extrablk is in use */ unsigned char extravalid; /* T/F: extrablk is in use */
unsigned char extraafter; /* T/F: extrablk is after new */ unsigned char extraafter; /* T/F: extrablk is after new */
xfs_da_state_blk_t extrablk; /* for double-splits on leafs */ xfs_da_state_blk_t extrablk; /* for double-splits on leaves */
/* for dirv2 extrablk is data */ /* for dirv2 extrablk is data */
} xfs_da_state_t; } xfs_da_state_t;

Просмотреть файл

@ -38,7 +38,7 @@ struct xfs_trans;
/* /*
* Directory address space divided into sections, * Directory address space divided into sections,
* spaces separated by 32gb. * spaces separated by 32GB.
*/ */
#define XFS_DIR2_SPACE_SIZE (1ULL << (32 + XFS_DIR2_DATA_ALIGN_LOG)) #define XFS_DIR2_SPACE_SIZE (1ULL << (32 + XFS_DIR2_DATA_ALIGN_LOG))
#define XFS_DIR2_DATA_SPACE 0 #define XFS_DIR2_DATA_SPACE 0

Просмотреть файл

@ -1104,7 +1104,7 @@ xfs_dir2_leafn_remove(
} }
xfs_dir2_leafn_check(dp, bp); xfs_dir2_leafn_check(dp, bp);
/* /*
* Return indication of whether this leaf block is emtpy enough * Return indication of whether this leaf block is empty enough
* to justify trying to join it with a neighbor. * to justify trying to join it with a neighbor.
*/ */
*rval = *rval =

Просмотреть файл

@ -576,7 +576,7 @@ out:
if (fdblks_delta) { if (fdblks_delta) {
/* /*
* If we are putting blocks back here, m_resblks_avail is * If we are putting blocks back here, m_resblks_avail is
* already at it's max so this will put it in the free pool. * already at its max so this will put it in the free pool.
* *
* If we need space, we'll either succeed in getting it * If we need space, we'll either succeed in getting it
* from the free block count or we'll get an enospc. If * from the free block count or we'll get an enospc. If

Просмотреть файл

@ -349,7 +349,7 @@ xfs_ialloc_ag_alloc(
* Initialize all inodes in this buffer and then log them. * Initialize all inodes in this buffer and then log them.
* *
* XXX: It would be much better if we had just one transaction to * XXX: It would be much better if we had just one transaction to
* log a whole cluster of inodes instead of all the indivdual * log a whole cluster of inodes instead of all the individual
* transactions causing a lot of log traffic. * transactions causing a lot of log traffic.
*/ */
xfs_biozero(fbuf, 0, ninodes << args.mp->m_sb.sb_inodelog); xfs_biozero(fbuf, 0, ninodes << args.mp->m_sb.sb_inodelog);

Просмотреть файл

@ -164,7 +164,7 @@ xfs_inobt_init_rec_from_cur(
} }
/* /*
* intial value of ptr for lookup * initial value of ptr for lookup
*/ */
STATIC void STATIC void
xfs_inobt_init_ptr_from_cur( xfs_inobt_init_ptr_from_cur(

Просмотреть файл

@ -122,7 +122,7 @@ typedef struct xfs_ictimestamp {
/* /*
* NOTE: This structure must be kept identical to struct xfs_dinode * NOTE: This structure must be kept identical to struct xfs_dinode
* in xfs_dinode.h except for the endianess annotations. * in xfs_dinode.h except for the endianness annotations.
*/ */
typedef struct xfs_icdinode { typedef struct xfs_icdinode {
__uint16_t di_magic; /* inode magic # = XFS_DINODE_MAGIC */ __uint16_t di_magic; /* inode magic # = XFS_DINODE_MAGIC */

Просмотреть файл

@ -63,7 +63,7 @@ typedef enum {
*/ */
typedef struct xfs_iomap { typedef struct xfs_iomap {
xfs_daddr_t iomap_bn; /* first 512b blk of mapping */ xfs_daddr_t iomap_bn; /* first 512B blk of mapping */
xfs_buftarg_t *iomap_target; xfs_buftarg_t *iomap_target;
xfs_off_t iomap_offset; /* offset of mapping, bytes */ xfs_off_t iomap_offset; /* offset of mapping, bytes */
xfs_off_t iomap_bsize; /* size of mapping, bytes */ xfs_off_t iomap_bsize; /* size of mapping, bytes */

Просмотреть файл

@ -584,7 +584,7 @@ xfs_bulkstat(
* first inode of the cluster. * first inode of the cluster.
* *
* Careful with clustidx. There can be * Careful with clustidx. There can be
* multple clusters per chunk, a single * multiple clusters per chunk, a single
* cluster per chunk or a cluster that has * cluster per chunk or a cluster that has
* inodes represented from several different * inodes represented from several different
* chunks (if blocksize is large). * chunks (if blocksize is large).

Просмотреть файл

@ -1098,7 +1098,7 @@ xlog_bdstrat_cb(struct xfs_buf *bp)
/* /*
* Return size of each in-core log record buffer. * Return size of each in-core log record buffer.
* *
* All machines get 8 x 32KB buffers by default, unless tuned otherwise. * All machines get 8 x 32kB buffers by default, unless tuned otherwise.
* *
* If the filesystem blocksize is too large, we may need to choose a * If the filesystem blocksize is too large, we may need to choose a
* larger size since the directory code currently logs entire blocks. * larger size since the directory code currently logs entire blocks.
@ -1128,8 +1128,8 @@ xlog_get_iclog_buffer_size(xfs_mount_t *mp,
} }
if (xfs_sb_version_haslogv2(&mp->m_sb)) { if (xfs_sb_version_haslogv2(&mp->m_sb)) {
/* # headers = size / 32K /* # headers = size / 32k
* one header holds cycles from 32K of data * one header holds cycles from 32k of data
*/ */
xhdrs = mp->m_logbsize / XLOG_HEADER_CYCLE_SIZE; xhdrs = mp->m_logbsize / XLOG_HEADER_CYCLE_SIZE;
@ -1145,7 +1145,7 @@ xlog_get_iclog_buffer_size(xfs_mount_t *mp,
goto done; goto done;
} }
/* All machines use 32KB buffers by default. */ /* All machines use 32kB buffers by default. */
log->l_iclog_size = XLOG_BIG_RECORD_BSIZE; log->l_iclog_size = XLOG_BIG_RECORD_BSIZE;
log->l_iclog_size_log = XLOG_BIG_RECORD_BSHIFT; log->l_iclog_size_log = XLOG_BIG_RECORD_BSHIFT;
@ -3179,7 +3179,7 @@ xlog_state_want_sync(xlog_t *log, xlog_in_core_t *iclog)
*/ */
/* /*
* Free a used ticket when it's refcount falls to zero. * Free a used ticket when its refcount falls to zero.
*/ */
void void
xfs_log_ticket_put( xfs_log_ticket_put(

Просмотреть файл

@ -644,7 +644,7 @@ xfs_initialize_perag_data(xfs_mount_t *mp, xfs_agnumber_t agcount)
for (index = 0; index < agcount; index++) { for (index = 0; index < agcount; index++) {
/* /*
* read the agf, then the agi. This gets us * read the agf, then the agi. This gets us
* all the inforamtion we need and populates the * all the information we need and populates the
* per-ag structures for us. * per-ag structures for us.
*/ */
error = xfs_alloc_pagf_init(mp, NULL, index, 0); error = xfs_alloc_pagf_init(mp, NULL, index, 0);
@ -1225,7 +1225,7 @@ xfs_unmountfs(
/* /*
* We can potentially deadlock here if we have an inode cluster * We can potentially deadlock here if we have an inode cluster
* that has been freed has it's buffer still pinned in memory because * that has been freed has its buffer still pinned in memory because
* the transaction is still sitting in a iclog. The stale inodes * the transaction is still sitting in a iclog. The stale inodes
* on that buffer will have their flush locks held until the * on that buffer will have their flush locks held until the
* transaction hits the disk and the callbacks run. the inode * transaction hits the disk and the callbacks run. the inode
@ -1257,7 +1257,7 @@ xfs_unmountfs(
* Unreserve any blocks we have so that when we unmount we don't account * Unreserve any blocks we have so that when we unmount we don't account
* the reserved free space as used. This is really only necessary for * the reserved free space as used. This is really only necessary for
* lazy superblock counting because it trusts the incore superblock * lazy superblock counting because it trusts the incore superblock
* counters to be aboslutely correct on clean unmount. * counters to be absolutely correct on clean unmount.
* *
* We don't bother correcting this elsewhere for lazy superblock * We don't bother correcting this elsewhere for lazy superblock
* counting because on mount of an unclean filesystem we reconstruct the * counting because on mount of an unclean filesystem we reconstruct the
@ -1860,7 +1860,7 @@ xfs_mount_log_sb(
* we disable the per-cpu counter and go through the slow path. * we disable the per-cpu counter and go through the slow path.
* *
* The slow path is the current xfs_mod_incore_sb() function. This means that * The slow path is the current xfs_mod_incore_sb() function. This means that
* when we disable a per-cpu counter, we need to drain it's resources back to * when we disable a per-cpu counter, we need to drain its resources back to
* the global superblock. We do this after disabling the counter to prevent * the global superblock. We do this after disabling the counter to prevent
* more threads from queueing up on the counter. * more threads from queueing up on the counter.
* *

Просмотреть файл

@ -380,8 +380,8 @@ typedef struct xfs_mount {
* Synchronous read and write sizes. This should be * Synchronous read and write sizes. This should be
* better for NFSv2 wsync filesystems. * better for NFSv2 wsync filesystems.
*/ */
#define XFS_WSYNC_READIO_LOG 15 /* 32K */ #define XFS_WSYNC_READIO_LOG 15 /* 32k */
#define XFS_WSYNC_WRITEIO_LOG 14 /* 16K */ #define XFS_WSYNC_WRITEIO_LOG 14 /* 16k */
/* /*
* Allow large block sizes to be reported to userspace programs if the * Allow large block sizes to be reported to userspace programs if the

Просмотреть файл

@ -23,8 +23,8 @@ struct xfs_trans;
/* Min and max rt extent sizes, specified in bytes */ /* Min and max rt extent sizes, specified in bytes */
#define XFS_MAX_RTEXTSIZE (1024 * 1024 * 1024) /* 1GB */ #define XFS_MAX_RTEXTSIZE (1024 * 1024 * 1024) /* 1GB */
#define XFS_DFL_RTEXTSIZE (64 * 1024) /* 64KB */ #define XFS_DFL_RTEXTSIZE (64 * 1024) /* 64kB */
#define XFS_MIN_RTEXTSIZE (4 * 1024) /* 4KB */ #define XFS_MIN_RTEXTSIZE (4 * 1024) /* 4kB */
/* /*
* Constants for bit manipulations. * Constants for bit manipulations.

Просмотреть файл

@ -292,7 +292,7 @@ xfs_lic_desc_to_chunk(xfs_log_item_desc_t *dp)
* In a write transaction we can allocate a maximum of 2 * In a write transaction we can allocate a maximum of 2
* extents. This gives: * extents. This gives:
* the inode getting the new extents: inode size * the inode getting the new extents: inode size
* the inode\'s bmap btree: max depth * block size * the inode's bmap btree: max depth * block size
* the agfs of the ags from which the extents are allocated: 2 * sector * the agfs of the ags from which the extents are allocated: 2 * sector
* the superblock free block counter: sector size * the superblock free block counter: sector size
* the allocation btrees: 2 exts * 2 trees * (2 * max depth - 1) * block size * the allocation btrees: 2 exts * 2 trees * (2 * max depth - 1) * block size
@ -321,7 +321,7 @@ xfs_lic_desc_to_chunk(xfs_log_item_desc_t *dp)
/* /*
* In truncating a file we free up to two extents at once. We can modify: * In truncating a file we free up to two extents at once. We can modify:
* the inode being truncated: inode size * the inode being truncated: inode size
* the inode\'s bmap btree: (max depth + 1) * block size * the inode's bmap btree: (max depth + 1) * block size
* And the bmap_finish transaction can free the blocks and bmap blocks: * And the bmap_finish transaction can free the blocks and bmap blocks:
* the agf for each of the ags: 4 * sector size * the agf for each of the ags: 4 * sector size
* the agfl for each of the ags: 4 * sector size * the agfl for each of the ags: 4 * sector size
@ -431,8 +431,8 @@ xfs_lic_desc_to_chunk(xfs_log_item_desc_t *dp)
* the new inode: inode size * the new inode: inode size
* the inode btree entry: 1 block * the inode btree entry: 1 block
* the directory btree: (max depth + v2) * dir block size * the directory btree: (max depth + v2) * dir block size
* the directory inode\'s bmap btree: (max depth + v2) * block size * the directory inode's bmap btree: (max depth + v2) * block size
* the blocks for the symlink: 1 KB * the blocks for the symlink: 1 kB
* Or in the first xact we allocate some inodes giving: * Or in the first xact we allocate some inodes giving:
* the agi and agf of the ag getting the new inodes: 2 * sectorsize * the agi and agf of the ag getting the new inodes: 2 * sectorsize
* the inode blocks allocated: XFS_IALLOC_BLOCKS * blocksize * the inode blocks allocated: XFS_IALLOC_BLOCKS * blocksize
@ -463,7 +463,7 @@ xfs_lic_desc_to_chunk(xfs_log_item_desc_t *dp)
* the inode btree entry: block size * the inode btree entry: block size
* the superblock for the nlink flag: sector size * the superblock for the nlink flag: sector size
* the directory btree: (max depth + v2) * dir block size * the directory btree: (max depth + v2) * dir block size
* the directory inode\'s bmap btree: (max depth + v2) * block size * the directory inode's bmap btree: (max depth + v2) * block size
* Or in the first xact we allocate some inodes giving: * Or in the first xact we allocate some inodes giving:
* the agi and agf of the ag getting the new inodes: 2 * sectorsize * the agi and agf of the ag getting the new inodes: 2 * sectorsize
* the superblock for the nlink flag: sector size * the superblock for the nlink flag: sector size
@ -637,7 +637,7 @@ xfs_lic_desc_to_chunk(xfs_log_item_desc_t *dp)
/* /*
* Removing the attribute fork of a file * Removing the attribute fork of a file
* the inode being truncated: inode size * the inode being truncated: inode size
* the inode\'s bmap btree: max depth * block size * the inode's bmap btree: max depth * block size
* And the bmap_finish transaction can free the blocks and bmap blocks: * And the bmap_finish transaction can free the blocks and bmap blocks:
* the agf for each of the ags: 4 * sector size * the agf for each of the ags: 4 * sector size
* the agfl for each of the ags: 4 * sector size * the agfl for each of the ags: 4 * sector size

Просмотреть файл

@ -79,7 +79,7 @@ xfs_trans_ail_tail(
* the push is run asynchronously in a separate thread, so we return the tail * the push is run asynchronously in a separate thread, so we return the tail
* of the log right now instead of the tail after the push. This means we will * of the log right now instead of the tail after the push. This means we will
* either continue right away, or we will sleep waiting on the async thread to * either continue right away, or we will sleep waiting on the async thread to
* do it's work. * do its work.
* *
* We do this unlocked - we only need to know whether there is anything in the * We do this unlocked - we only need to know whether there is anything in the
* AIL at the time we are called. We don't need to access the contents of * AIL at the time we are called. We don't need to access the contents of
@ -160,7 +160,7 @@ xfs_trans_ail_cursor_next(
/* /*
* Now that the traversal is complete, we need to remove the cursor * Now that the traversal is complete, we need to remove the cursor
* from the list of traversing cursors. Avoid removing the embedded * from the list of traversing cursors. Avoid removing the embedded
* push cursor, but use the fact it is alway present to make the * push cursor, but use the fact it is always present to make the
* list deletion simple. * list deletion simple.
*/ */
void void

Просмотреть файл

@ -22,7 +22,7 @@
#include "xfs_inum.h" #include "xfs_inum.h"
#include "xfs_trans.h" #include "xfs_trans.h"
#include "xfs_trans_priv.h" #include "xfs_trans_priv.h"
/* XXX: from here down needed until struct xfs_trans has it's own ailp */ /* XXX: from here down needed until struct xfs_trans has its own ailp */
#include "xfs_bit.h" #include "xfs_bit.h"
#include "xfs_buf_item.h" #include "xfs_buf_item.h"
#include "xfs_sb.h" #include "xfs_sb.h"

Просмотреть файл

@ -374,7 +374,7 @@ xfs_truncate_file(
/* /*
* Follow the normal truncate locking protocol. Since we * Follow the normal truncate locking protocol. Since we
* hold the inode in the transaction, we know that it's number * hold the inode in the transaction, we know that its number
* of references will stay constant. * of references will stay constant.
*/ */
xfs_ilock(ip, XFS_ILOCK_EXCL); xfs_ilock(ip, XFS_ILOCK_EXCL);

Просмотреть файл

@ -2862,7 +2862,7 @@ xfs_free_file_space(
/* /*
* Need to zero the stuff we're not freeing, on disk. * Need to zero the stuff we're not freeing, on disk.
* If its a realtime file & can't use unwritten extents then we * If it's a realtime file & can't use unwritten extents then we
* actually need to zero the extent edges. Otherwise xfs_bunmapi * actually need to zero the extent edges. Otherwise xfs_bunmapi
* will take care of it for us. * will take care of it for us.
*/ */