iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JFS: White space cleanup

Browse Source 
Removed trailing spaces & tabs, and spaces preceding tabs.
Also a couple very minor comment cleanups.

Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
(cherry picked from f74156539964d7b3d5164fdf8848e6a682f75b97 commit)
This commit is contained in:
Dave Kleikamp 2006-10-02 09:55:27 -05:00
parent 087387f90f
commit 63f83c9fcf
41 changed files with 509 additions and 511 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/jfs/endian24.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) International Business Machines Corp., 2001 * Copyright (C) International Business Machines Corp., 2001
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

2
fs/jfs/file.c
View File

@ -108,7 +108,7 @@ const struct file_operations jfs_file_operations = {
.aio_read = generic_file_aio_read, .aio_read = generic_file_aio_read,
.aio_write = generic_file_aio_write, .aio_write = generic_file_aio_write,
.mmap = generic_file_mmap, .mmap = generic_file_mmap,
.sendfile = generic_file_sendfile, .sendfile = generic_file_sendfile,
.fsync = jfs_fsync, .fsync = jfs_fsync,
.release = jfs_release, .release = jfs_release,
.ioctl = jfs_ioctl, .ioctl = jfs_ioctl,

2
fs/jfs/jfs_acl.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) International Business Machines Corp., 2002 * Copyright (C) International Business Machines Corp., 2002
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

2
fs/jfs/jfs_dinode.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) International Business Machines Corp., 2000-2001 * Copyright (C) International Business Machines Corp., 2000-2001
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

20
fs/jfs/jfs_dmap.c
View File

@ -35,7 +35,7 @@
* level and move up through the dmap control pages (i.e. * level and move up through the dmap control pages (i.e.
* the vast majority of requests). * the vast majority of requests).
* *
* 2) allocation requests that start at dmap control page * 2) allocation requests that start at dmap control page
* level and work down towards the dmaps. * level and work down towards the dmaps.
* *
* the serialization scheme used here is as follows. * the serialization scheme used here is as follows.
@ -50,7 +50,7 @@
* take this lock in write mode while request starting at the bottom * take this lock in write mode while request starting at the bottom
* take the lock in read mode. a single top-down request may proceed * take the lock in read mode. a single top-down request may proceed
* exclusively while multiple bottoms-up requests may proceed * exclusively while multiple bottoms-up requests may proceed
* simultaneously (under the protection of busy buffers). * simultaneously (under the protection of busy buffers).
* *
* in addition to information found in dmaps and dmap control pages, * in addition to information found in dmaps and dmap control pages,
* the working state of the block allocation map also includes read/ * the working state of the block allocation map also includes read/
@ -146,7 +146,7 @@ static const s8 budtab[256] = {
/* /*
* NAME: dbMount() * NAME: dbMount()
* *
* FUNCTION: initializate the block allocation map. * FUNCTION: initializate the block allocation map.
* *
@ -223,12 +223,12 @@ int dbMount(struct inode *ipbmap)
/* /*
* NAME: dbUnmount() * NAME: dbUnmount()
* *
* FUNCTION: terminate the block allocation map in preparation for * FUNCTION: terminate the block allocation map in preparation for
* file system unmount. * file system unmount.
* *
* the in-core bmap descriptor is written to disk and * the in-core bmap descriptor is written to disk and
* the memory for this descriptor is freed. * the memory for this descriptor is freed.
* *
* PARAMETERS: * PARAMETERS:
@ -311,7 +311,7 @@ int dbSync(struct inode *ipbmap)
/* /*
* NAME: dbFree() * NAME: dbFree()
* *
* FUNCTION: free the specified block range from the working block * FUNCTION: free the specified block range from the working block
* allocation map. * allocation map.
@ -662,7 +662,7 @@ unlock:
* the block allocation policy uses hints and a multi-step * the block allocation policy uses hints and a multi-step
* approach. * approach.
* *
* for allocation requests smaller than the number of blocks * for allocation requests smaller than the number of blocks
* per dmap, we first try to allocate the new blocks * per dmap, we first try to allocate the new blocks
* immediately following the hint. if these blocks are not * immediately following the hint. if these blocks are not
* available, we try to allocate blocks near the hint. if * available, we try to allocate blocks near the hint. if
@ -1705,7 +1705,7 @@ static int dbFindCtl(struct bmap * bmp, int l2nb, int level, s64 * blkno)
* this routine is called by higher level routines that search * this routine is called by higher level routines that search
* the dmap control pages above the actual dmaps for contiguous * the dmap control pages above the actual dmaps for contiguous
* free space. the result of successful searches by these * free space. the result of successful searches by these
* routines are the starting block numbers within dmaps, with * routines are the starting block numbers within dmaps, with
* the dmaps themselves containing the desired contiguous free * the dmaps themselves containing the desired contiguous free
* space or starting a contiguous free space of desired size * space or starting a contiguous free space of desired size
* that is made up of the blocks of one or more dmaps. these * that is made up of the blocks of one or more dmaps. these
@ -3090,7 +3090,7 @@ static int blkstol2(s64 nb)
/* /*
* NAME: dbAllocBottomUp() * NAME: dbAllocBottomUp()
* *
* FUNCTION: alloc the specified block range from the working block * FUNCTION: alloc the specified block range from the working block
* allocation map. * allocation map.
@ -3273,7 +3273,7 @@ static int dbAllocDmapBU(struct bmap * bmp, struct dmap * dp, s64 blkno,
* NAME: dbExtendFS() * NAME: dbExtendFS()
* *
* FUNCTION: extend bmap from blkno for nblocks; * FUNCTION: extend bmap from blkno for nblocks;
* dbExtendFS() updates bmap ready for dbAllocBottomUp(); * dbExtendFS() updates bmap ready for dbAllocBottomUp();
* *
* L2 * L2
* | * |

14
fs/jfs/jfs_dmap.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) International Business Machines Corp., 2000-2002 * Copyright (C) International Business Machines Corp., 2000-2002
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -27,7 +27,7 @@
#define L2LPERDMAP 8 /* l2 number of leaves per dmap tree */ #define L2LPERDMAP 8 /* l2 number of leaves per dmap tree */
#define DBWORD 32 /* # of blks covered by a map word */ #define DBWORD 32 /* # of blks covered by a map word */
#define L2DBWORD 5 /* l2 # of blks covered by a mword */ #define L2DBWORD 5 /* l2 # of blks covered by a mword */
#define BUDMIN L2DBWORD /* max free string in a map word */ #define BUDMIN L2DBWORD /* max free string in a map word */
#define BPERDMAP (LPERDMAP * DBWORD) /* num of blks per dmap */ #define BPERDMAP (LPERDMAP * DBWORD) /* num of blks per dmap */
#define L2BPERDMAP 13 /* l2 num of blks per dmap */ #define L2BPERDMAP 13 /* l2 num of blks per dmap */
#define CTLTREESIZE (1024+256+64+16+4+1) /* size of a dmapctl tree */ #define CTLTREESIZE (1024+256+64+16+4+1) /* size of a dmapctl tree */
@ -192,11 +192,11 @@ typedef union dmtree {
/* macros for accessing fields within dmtree */ /* macros for accessing fields within dmtree */
#define dmt_nleafs t1.nleafs #define dmt_nleafs t1.nleafs
#define dmt_l2nleafs t1.l2nleafs #define dmt_l2nleafs t1.l2nleafs
#define dmt_leafidx t1.leafidx #define dmt_leafidx t1.leafidx
#define dmt_height t1.height #define dmt_height t1.height
#define dmt_budmin t1.budmin #define dmt_budmin t1.budmin
#define dmt_stree t1.stree #define dmt_stree t1.stree
/* /*
* on-disk aggregate disk allocation map descriptor. * on-disk aggregate disk allocation map descriptor.

6
fs/jfs/jfs_dtree.c
View File

@ -78,7 +78,7 @@
* *
* case-insensitive search: * case-insensitive search:
* *
* fold search key; * fold search key;
* *
* case-insensitive search of B-tree: * case-insensitive search of B-tree:
* for internal entry, router key is already folded; * for internal entry, router key is already folded;
@ -93,7 +93,7 @@
* else * else
* return no match; * return no match;
* *
* serialization: * serialization:
* target directory inode lock is being held on entry/exit * target directory inode lock is being held on entry/exit
* of all main directory service routines. * of all main directory service routines.
* *
@ -925,7 +925,7 @@ int dtInsert(tid_t tid, struct inode *ip,
* *
* return: 0 - success; * return: 0 - success;
* errno - failure; * errno - failure;
* leaf page unpinned; * leaf page unpinned;
*/ */
static int dtSplitUp(tid_t tid, static int dtSplitUp(tid_t tid,
struct inode *ip, struct dtsplit * split, struct btstack * btstack) struct inode *ip, struct dtsplit * split, struct btstack * btstack)

4
fs/jfs/jfs_dtree.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) International Business Machines Corp., 2000-2002 * Copyright (C) International Business Machines Corp., 2000-2002
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -80,7 +80,7 @@ struct idtentry {
/* /*
* leaf node entry head/only segment * leaf node entry head/only segment
* *
* For legacy filesystems, name contains 13 wchars -- no index field * For legacy filesystems, name contains 13 wchars -- no index field
*/ */
struct ldtentry { struct ldtentry {
__le32 inumber; /* 4: 4-byte aligned */ __le32 inumber; /* 4: 4-byte aligned */

12
fs/jfs/jfs_extent.c
View File

@ -582,16 +582,16 @@ extBalloc(struct inode *ip, s64 hint, s64 * nblocks, s64 * blkno)
* *
* FUNCTION: attempt to extend an extent's allocation. * FUNCTION: attempt to extend an extent's allocation.
* *
* initially, we will try to extend the extent's allocation * Initially, we will try to extend the extent's allocation
* in place. if this fails, we'll try to move the extent * in place. If this fails, we'll try to move the extent
* to a new set of blocks. if moving the extent, we initially * to a new set of blocks. If moving the extent, we initially
* will try to allocate disk blocks for the requested size * will try to allocate disk blocks for the requested size
* (nnew). if this fails (new contiguous free blocks not * (newnblks). if this fails (new contiguous free blocks not
* avaliable), we'll try to allocate a smaller number of * avaliable), we'll try to allocate a smaller number of
* blocks (producing a smaller extent), with this smaller * blocks (producing a smaller extent), with this smaller
* number of blocks consisting of the requested number of * number of blocks consisting of the requested number of
* blocks rounded down to the next smaller power of 2 * blocks rounded down to the next smaller power of 2
* number (i.e. 16 -> 8). we'll continue to round down and * number (i.e. 16 -> 8). We'll continue to round down and
* retry the allocation until the number of blocks to allocate * retry the allocation until the number of blocks to allocate
* is smaller than the number of blocks per page. * is smaller than the number of blocks per page.
* *

2
fs/jfs/jfs_extent.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) International Business Machines Corp., 2000-2001 * Copyright (C) International Business Machines Corp., 2000-2001
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

2
fs/jfs/jfs_filsys.h
View File

@ -49,7 +49,7 @@
#define JFS_DFS 0x20000000 /* DCE DFS LFS support */ #define JFS_DFS 0x20000000 /* DCE DFS LFS support */
#define JFS_LINUX 0x10000000 /* Linux support */ #define JFS_LINUX 0x10000000 /* Linux support */
/* case-sensitive name/directory support */ /* case-sensitive name/directory support */
/* directory option */ /* directory option */

102
fs/jfs/jfs_imap.c
View File

@ -107,7 +107,7 @@ static void copy_to_dinode(struct dinode *, struct inode *);
* RETURN VALUES: * RETURN VALUES:
* 0 - success * 0 - success
* -ENOMEM - insufficient free virtual memory. * -ENOMEM - insufficient free virtual memory.
* -EIO - i/o error. * -EIO - i/o error.
*/ */
int diMount(struct inode *ipimap) int diMount(struct inode *ipimap)
{ {
@ -191,7 +191,7 @@ int diMount(struct inode *ipimap)
* RETURN VALUES: * RETURN VALUES:
* 0 - success * 0 - success
* -ENOMEM - insufficient free virtual memory. * -ENOMEM - insufficient free virtual memory.
* -EIO - i/o error. * -EIO - i/o error.
*/ */
int diUnmount(struct inode *ipimap, int mounterror) int diUnmount(struct inode *ipimap, int mounterror)
{ {
@ -302,7 +302,7 @@ int diSync(struct inode *ipimap)
* *
* RETURN VALUES: * RETURN VALUES:
* 0 - success * 0 - success
* -EIO - i/o error. * -EIO - i/o error.
* -ENOMEM - insufficient memory * -ENOMEM - insufficient memory
* *
*/ */
@ -593,7 +593,7 @@ void diFreeSpecial(struct inode *ip)
* *
* RETURN VALUES: * RETURN VALUES:
* 0 - success * 0 - success
* -EIO - i/o error. * -EIO - i/o error.
*/ */
int diWrite(tid_t tid, struct inode *ip) int diWrite(tid_t tid, struct inode *ip)
{ {
@ -865,11 +865,11 @@ int diWrite(tid_t tid, struct inode *ip)
* any updates and are held until all updates are complete. * any updates and are held until all updates are complete.
* *
* PARAMETERS: * PARAMETERS:
* ip - inode to be freed. * ip - inode to be freed.
* *
* RETURN VALUES: * RETURN VALUES:
* 0 - success * 0 - success
* -EIO - i/o error. * -EIO - i/o error.
*/ */
int diFree(struct inode *ip) int diFree(struct inode *ip)
{ {
@ -1344,14 +1344,14 @@ diInitInode(struct inode *ip, int iagno, int ino, int extno, struct iag * iagp)
* for a fileset or aggregate. * for a fileset or aggregate.
* *
* PARAMETERS: * PARAMETERS:
* pip - pointer to incore inode for the parent inode. * pip - pointer to incore inode for the parent inode.
* dir - 'true' if the new disk inode is for a directory. * dir - 'true' if the new disk inode is for a directory.
* ip - pointer to a new inode * ip - pointer to a new inode
* *
* RETURN VALUES: * RETURN VALUES:
* 0 - success. * 0 - success.
* -ENOSPC - insufficient disk resources. * -ENOSPC - insufficient disk resources.
* -EIO - i/o error. * -EIO - i/o error.
*/ */
int diAlloc(struct inode *pip, bool dir, struct inode *ip) int diAlloc(struct inode *pip, bool dir, struct inode *ip)
{ {
@ -1649,17 +1649,17 @@ int diAlloc(struct inode *pip, bool dir, struct inode *ip)
* PRE CONDITION: Already have the AG lock for this AG. * PRE CONDITION: Already have the AG lock for this AG.
* *
* PARAMETERS: * PARAMETERS:
* imap - pointer to inode map control structure. * imap - pointer to inode map control structure.
* agno - allocation group to allocate from. * agno - allocation group to allocate from.
* dir - 'true' if the new disk inode is for a directory. * dir - 'true' if the new disk inode is for a directory.
* ip - pointer to the new inode to be filled in on successful return * ip - pointer to the new inode to be filled in on successful return
* with the disk inode number allocated, its extent address * with the disk inode number allocated, its extent address
* and the start of the ag. * and the start of the ag.
* *
* RETURN VALUES: * RETURN VALUES:
* 0 - success. * 0 - success.
* -ENOSPC - insufficient disk resources. * -ENOSPC - insufficient disk resources.
* -EIO - i/o error. * -EIO - i/o error.
*/ */
static int static int
diAllocAG(struct inomap * imap, int agno, bool dir, struct inode *ip) diAllocAG(struct inomap * imap, int agno, bool dir, struct inode *ip)
@ -1719,17 +1719,17 @@ diAllocAG(struct inomap * imap, int agno, bool dir, struct inode *ip)
* specified primary group. * specified primary group.
* *
* PARAMETERS: * PARAMETERS:
* imap - pointer to inode map control structure. * imap - pointer to inode map control structure.
* agno - primary allocation group (to avoid). * agno - primary allocation group (to avoid).
* dir - 'true' if the new disk inode is for a directory. * dir - 'true' if the new disk inode is for a directory.
* ip - pointer to a new inode to be filled in on successful return * ip - pointer to a new inode to be filled in on successful return
* with the disk inode number allocated, its extent address * with the disk inode number allocated, its extent address
* and the start of the ag. * and the start of the ag.
* *
* RETURN VALUES: * RETURN VALUES:
* 0 - success. * 0 - success.
* -ENOSPC - insufficient disk resources. * -ENOSPC - insufficient disk resources.
* -EIO - i/o error. * -EIO - i/o error.
*/ */
static int static int
diAllocAny(struct inomap * imap, int agno, bool dir, struct inode *ip) diAllocAny(struct inomap * imap, int agno, bool dir, struct inode *ip)
@ -1785,16 +1785,16 @@ diAllocAny(struct inomap * imap, int agno, bool dir, struct inode *ip)
* PRE CONDITION: Already have AG lock for this AG. * PRE CONDITION: Already have AG lock for this AG.
* *
* PARAMETERS: * PARAMETERS:
* imap - pointer to inode map control structure. * imap - pointer to inode map control structure.
* agno - allocation group. * agno - allocation group.
* ip - pointer to new inode to be filled in on successful return * ip - pointer to new inode to be filled in on successful return
* with the disk inode number allocated, its extent address * with the disk inode number allocated, its extent address
* and the start of the ag. * and the start of the ag.
* *
* RETURN VALUES: * RETURN VALUES:
* 0 - success. * 0 - success.
* -ENOSPC - insufficient disk resources. * -ENOSPC - insufficient disk resources.
* -EIO - i/o error. * -EIO - i/o error.
*/ */
static int diAllocIno(struct inomap * imap, int agno, struct inode *ip) static int diAllocIno(struct inomap * imap, int agno, struct inode *ip)
{ {
@ -1892,9 +1892,9 @@ static int diAllocIno(struct inomap * imap, int agno, struct inode *ip)
/* /*
* NAME: diAllocExt(imap,agno,ip) * NAME: diAllocExt(imap,agno,ip)
* *
* FUNCTION: add a new extent of free inodes to an iag, allocating * FUNCTION: add a new extent of free inodes to an iag, allocating
* an inode from this extent to satisfy the current allocation * an inode from this extent to satisfy the current allocation
* request. * request.
* *
* this routine first tries to find an existing iag with free * this routine first tries to find an existing iag with free
* extents through the ag free extent list. if list is not * extents through the ag free extent list. if list is not
@ -1910,16 +1910,16 @@ static int diAllocIno(struct inomap * imap, int agno, struct inode *ip)
* for the purpose of satisfying this request. * for the purpose of satisfying this request.
* *
* PARAMETERS: * PARAMETERS:
* imap - pointer to inode map control structure. * imap - pointer to inode map control structure.
* agno - allocation group number. * agno - allocation group number.
* ip - pointer to new inode to be filled in on successful return * ip - pointer to new inode to be filled in on successful return
* with the disk inode number allocated, its extent address * with the disk inode number allocated, its extent address
* and the start of the ag. * and the start of the ag.
* *
* RETURN VALUES: * RETURN VALUES:
* 0 - success. * 0 - success.
* -ENOSPC - insufficient disk resources. * -ENOSPC - insufficient disk resources.
* -EIO - i/o error. * -EIO - i/o error.
*/ */
static int diAllocExt(struct inomap * imap, int agno, struct inode *ip) static int diAllocExt(struct inomap * imap, int agno, struct inode *ip)
{ {
@ -2012,7 +2012,7 @@ static int diAllocExt(struct inomap * imap, int agno, struct inode *ip)
/* /*
* NAME: diAllocBit(imap,iagp,ino) * NAME: diAllocBit(imap,iagp,ino)
* *
* FUNCTION: allocate a backed inode from an iag. * FUNCTION: allocate a backed inode from an iag.
* *
* this routine performs the mechanics of allocating a * this routine performs the mechanics of allocating a
* specified inode from a backed extent. * specified inode from a backed extent.
@ -2030,14 +2030,14 @@ static int diAllocExt(struct inomap * imap, int agno, struct inode *ip)
* this AG. Must have read lock on imap inode. * this AG. Must have read lock on imap inode.
* *
* PARAMETERS: * PARAMETERS:
* imap - pointer to inode map control structure. * imap - pointer to inode map control structure.
* iagp - pointer to iag. * iagp - pointer to iag.
* ino - inode number to be allocated within the iag. * ino - inode number to be allocated within the iag.
* *
* RETURN VALUES: * RETURN VALUES:
* 0 - success. * 0 - success.
* -ENOSPC - insufficient disk resources. * -ENOSPC - insufficient disk resources.
* -EIO - i/o error. * -EIO - i/o error.
*/ */
static int diAllocBit(struct inomap * imap, struct iag * iagp, int ino) static int diAllocBit(struct inomap * imap, struct iag * iagp, int ino)
{ {
@ -2177,14 +2177,14 @@ static int diAllocBit(struct inomap * imap, struct iag * iagp, int ino)
* this AG. Must have read lock on imap inode. * this AG. Must have read lock on imap inode.
* *
* PARAMETERS: * PARAMETERS:
* imap - pointer to inode map control structure. * imap - pointer to inode map control structure.
* iagp - pointer to iag. * iagp - pointer to iag.
* extno - extent number. * extno - extent number.
* *
* RETURN VALUES: * RETURN VALUES:
* 0 - success. * 0 - success.
* -ENOSPC - insufficient disk resources. * -ENOSPC - insufficient disk resources.
* -EIO - i/o error. * -EIO - i/o error.
*/ */
static int diNewExt(struct inomap * imap, struct iag * iagp, int extno) static int diNewExt(struct inomap * imap, struct iag * iagp, int extno)
{ {
@ -2432,7 +2432,7 @@ static int diNewExt(struct inomap * imap, struct iag * iagp, int extno)
/* /*
* NAME: diNewIAG(imap,iagnop,agno) * NAME: diNewIAG(imap,iagnop,agno)
* *
* FUNCTION: allocate a new iag for an allocation group. * FUNCTION: allocate a new iag for an allocation group.
* *
* first tries to allocate the iag from the inode map * first tries to allocate the iag from the inode map
* iagfree list: * iagfree list:
@ -2443,16 +2443,16 @@ static int diNewExt(struct inomap * imap, struct iag * iagp, int extno)
* and returned to satisfy the request. * and returned to satisfy the request.
* *
* PARAMETERS: * PARAMETERS:
* imap - pointer to inode map control structure. * imap - pointer to inode map control structure.
* iagnop - pointer to an iag number set with the number of the * iagnop - pointer to an iag number set with the number of the
* newly allocated iag upon successful return. * newly allocated iag upon successful return.
* agno - allocation group number. * agno - allocation group number.
* bpp - Buffer pointer to be filled in with new IAG's buffer * bpp - Buffer pointer to be filled in with new IAG's buffer
* *
* RETURN VALUES: * RETURN VALUES:
* 0 - success. * 0 - success.
* -ENOSPC - insufficient disk resources. * -ENOSPC - insufficient disk resources.
* -EIO - i/o error. * -EIO - i/o error.
* *
* serialization: * serialization:
* AG lock held on entry/exit; * AG lock held on entry/exit;
@ -2680,9 +2680,9 @@ diNewIAG(struct inomap * imap, int *iagnop, int agno, struct metapage ** mpp)
* or aggregate inode map. * or aggregate inode map.
* *
* PARAMETERS: * PARAMETERS:
* imap - pointer to inode map control structure. * imap - pointer to inode map control structure.
* iagno - iag number. * iagno - iag number.
* bpp - point to buffer pointer to be filled in on successful * bpp - point to buffer pointer to be filled in on successful
* exit. * exit.
* *
* SERIALIZATION: * SERIALIZATION:
@ -2692,7 +2692,7 @@ diNewIAG(struct inomap * imap, int *iagnop, int agno, struct metapage ** mpp)
* *
* RETURN VALUES: * RETURN VALUES:
* 0 - success. * 0 - success.
* -EIO - i/o error. * -EIO - i/o error.
*/ */
static int diIAGRead(struct inomap * imap, int iagno, struct metapage ** mpp) static int diIAGRead(struct inomap * imap, int iagno, struct metapage ** mpp)
{ {
@ -2718,8 +2718,8 @@ static int diIAGRead(struct inomap * imap, int iagno, struct metapage ** mpp)
* the specified bit position. * the specified bit position.
* *
* PARAMETERS: * PARAMETERS:
* word - word to be examined. * word - word to be examined.
* start - starting bit position. * start - starting bit position.
* *
* RETURN VALUES: * RETURN VALUES:
* bit position of first free bit in the word or 32 if * bit position of first free bit in the word or 32 if

4
fs/jfs/jfs_imap.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) International Business Machines Corp., 2000-2002 * Copyright (C) International Business Machines Corp., 2000-2002
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -45,7 +45,7 @@
/* get the starting block number of the 4K page of an inode extent /* get the starting block number of the 4K page of an inode extent
* that contains ino. * that contains ino.
*/ */
#define INOPBLK(pxd,ino,l2nbperpg) (addressPXD((pxd)) + \ #define INOPBLK(pxd,ino,l2nbperpg) (addressPXD((pxd)) + \
((((ino) & (INOSPEREXT-1)) >> L2INOSPERPAGE) << (l2nbperpg))) ((((ino) & (INOSPEREXT-1)) >> L2INOSPERPAGE) << (l2nbperpg)))
/* /*

4
fs/jfs/jfs_lock.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (c) International Business Machines Corp., 2000-2001 * Copyright (C) International Business Machines Corp., 2000-2001
* Portions Copyright (c) Christoph Hellwig, 2001-2002 * Portions Copyright (C) Christoph Hellwig, 2001-2002
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

6
fs/jfs/jfs_logmgr.c
View File

@ -920,7 +920,7 @@ static void lmPostGC(struct lbuf * bp)
* this code is called again. * this code is called again.
* *
* PARAMETERS: log - log structure * PARAMETERS: log - log structure
* hard_sync - 1 to force all metadata to be written * hard_sync - 1 to force all metadata to be written
* *
* RETURN: 0 * RETURN: 0
* *
@ -1052,7 +1052,7 @@ static int lmLogSync(struct jfs_log * log, int hard_sync)
* FUNCTION: write log SYNCPT record for specified log * FUNCTION: write log SYNCPT record for specified log
* *
* PARAMETERS: log - log structure * PARAMETERS: log - log structure
* hard_sync - set to 1 to force metadata to be written * hard_sync - set to 1 to force metadata to be written
*/ */
void jfs_syncpt(struct jfs_log *log, int hard_sync) void jfs_syncpt(struct jfs_log *log, int hard_sync)
{ LOG_LOCK(log); { LOG_LOCK(log);
@ -1067,7 +1067,7 @@ void jfs_syncpt(struct jfs_log *log, int hard_sync)
* insert filesystem in the active list of the log. * insert filesystem in the active list of the log.
* *
* PARAMETER: ipmnt - file system mount inode * PARAMETER: ipmnt - file system mount inode
* iplog - log inode (out) * iplog - log inode (out)
* *
* RETURN: * RETURN:
* *

6
fs/jfs/jfs_logmgr.h
View File

@ -319,12 +319,10 @@ struct lrd {
* do not apply records which precede this record in the log * do not apply records which precede this record in the log
* with the same inode number. * with the same inode number.
* *
* NOREDILE must be the first to be written at commit * NOREDOFILE must be the first to be written at commit
* (last to be read in logredo()) - it prevents * (last to be read in logredo()) - it prevents
* replay of preceding updates of all preceding generations * replay of preceding updates of all preceding generations
* of the inumber esp. the on-disk inode itself, * of the inumber esp. the on-disk inode itself.
* but does NOT prevent
* replay of the
*/ */
struct { struct {
__le32 fileset; /* 4: fileset number */ __le32 fileset; /* 4: fileset number */

2
fs/jfs/jfs_metapage.h
View File

@ -33,7 +33,7 @@ struct metapage {
unsigned long flag; /* See Below */ unsigned long flag; /* See Below */
unsigned long count; /* Reference count */ unsigned long count; /* Reference count */
void *data; /* Data pointer */ void *data; /* Data pointer */
sector_t index; /* block address of page */ sector_t index; /* block address of page */
wait_queue_head_t wait; wait_queue_head_t wait;
/* implementation */ /* implementation */

2
fs/jfs/jfs_superblock.h
View File

@ -21,7 +21,7 @@
/* /*
* make the magic number something a human could read * make the magic number something a human could read
*/ */
#define JFS_MAGIC "JFS1" /* Magic word */ #define JFS_MAGIC "JFS1" /* Magic word */
#define JFS_VERSION 2 /* Version number: Version 2 */ #define JFS_VERSION 2 /* Version number: Version 2 */

2
fs/jfs/jfs_txnmgr.h
View File

@ -179,7 +179,7 @@ struct linelock {
/* (8) */ /* (8) */
struct lv lv[20]; /* 40: */ struct lv lv[20]; /* 40: */
}; /* (48) */ }; /* (48) */
#define dt_lock linelock #define dt_lock linelock

2
fs/jfs/jfs_unicode.c
View File

@ -58,7 +58,7 @@ int jfs_strfromUCS_le(char *to, const __le16 * from,
warn_again--; warn_again--;
printk(KERN_ERR printk(KERN_ERR
"non-latin1 character 0x%x found in JFS file name\n", "non-latin1 character 0x%x found in JFS file name\n",
le16_to_cpu(from[i])); le16_to_cpu(from[i]));
printk(KERN_ERR printk(KERN_ERR
"mount with iocharset=utf8 to access\n"); "mount with iocharset=utf8 to access\n");
} }

4
fs/jfs/jfs_unicode.h
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (c) International Business Machines Corp., 2000-2002 * Copyright (C) International Business Machines Corp., 2000-2002
* Portions Copyright (c) Christoph Hellwig, 2001-2002 * Portions Copyright (C) Christoph Hellwig, 2001-2002
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

2
fs/jfs/jfs_uniupr.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) International Business Machines Corp., 2000-2002 * Copyright (C) International Business Machines Corp., 2000-2002
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

2
fs/jfs/jfs_xattr.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) International Business Machines Corp., 2000-2002 * Copyright (C) International Business Machines Corp., 2000-2002
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

2
fs/jfs/jfs_xtree.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) International Business Machines Corp., 2000-2002 * Copyright (C) International Business Machines Corp., 2000-2002
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

14
fs/jfs/namei.c
View File

@ -62,7 +62,7 @@ static inline void free_ea_wmap(struct inode *inode)
* FUNCTION: create a regular file in the parent directory <dip> * FUNCTION: create a regular file in the parent directory <dip>
* with name = <from dentry> and mode = <mode> * with name = <from dentry> and mode = <mode>
* *
* PARAMETER: dip - parent directory vnode * PARAMETER: dip - parent directory vnode
* dentry - dentry of new file * dentry - dentry of new file
* mode - create mode (rwxrwxrwx). * mode - create mode (rwxrwxrwx).
* nd- nd struct * nd- nd struct
@ -190,7 +190,7 @@ static int jfs_create(struct inode *dip, struct dentry *dentry, int mode,
* FUNCTION: create a child directory in the parent directory <dip> * FUNCTION: create a child directory in the parent directory <dip>
* with name = <from dentry> and mode = <mode> * with name = <from dentry> and mode = <mode>
* *
* PARAMETER: dip - parent directory vnode * PARAMETER: dip - parent directory vnode
* dentry - dentry of child directory * dentry - dentry of child directory
* mode - create mode (rwxrwxrwx). * mode - create mode (rwxrwxrwx).
* *
@ -324,7 +324,7 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, int mode)
* *
* FUNCTION: remove a link to child directory * FUNCTION: remove a link to child directory
* *
* PARAMETER: dip - parent inode * PARAMETER: dip - parent inode
* dentry - child directory dentry * dentry - child directory dentry
* *
* RETURN: -EINVAL - if name is . or .. * RETURN: -EINVAL - if name is . or ..
@ -449,8 +449,8 @@ static int jfs_rmdir(struct inode *dip, struct dentry *dentry)
* FUNCTION: remove a link to object <vp> named by <name> * FUNCTION: remove a link to object <vp> named by <name>
* from parent directory <dvp> * from parent directory <dvp>
* *
* PARAMETER: dip - inode of parent directory * PARAMETER: dip - inode of parent directory
* dentry - dentry of object to be removed * dentry - dentry of object to be removed
* *
* RETURN: errors from subroutines * RETURN: errors from subroutines
* *
@ -762,7 +762,7 @@ void jfs_free_zero_link(struct inode *ip)
* FUNCTION: create a link to <vp> by the name = <name> * FUNCTION: create a link to <vp> by the name = <name>
* in the parent directory <dvp> * in the parent directory <dvp>
* *
* PARAMETER: vp - target object * PARAMETER: vp - target object
* dvp - parent directory of new link * dvp - parent directory of new link
* name - name of new link to target object * name - name of new link to target object
* crp - credential * crp - credential
@ -858,7 +858,7 @@ static int jfs_link(struct dentry *old_dentry,
* in directory <dip> * in directory <dip>
* *
* PARAMETER: dip - parent directory vnode * PARAMETER: dip - parent directory vnode
* dentry - dentry of symbolic link * dentry - dentry of symbolic link
* name - the path name of the existing object * name - the path name of the existing object
* that will be the source of the link * that will be the source of the link
* *

6
fs/jfs/xattr.c
View File

@ -449,7 +449,7 @@ static int ea_read(struct inode *ip, struct jfs_ea_list *ealist)
* attributes size, or min_size. * attributes size, or min_size.
* *
* The buffer, which may be inlined in the inode or in the * The buffer, which may be inlined in the inode or in the
* page cache must be release by calling ea_release or ea_put * page cache must be release by calling ea_release or ea_put
* *
* PARAMETERS: * PARAMETERS:
* inode - Inode pointer * inode - Inode pointer
@ -1054,7 +1054,7 @@ ssize_t jfs_listxattr(struct dentry * dentry, char *data, size_t buf_size)
/* compute required size of list */ /* compute required size of list */
for (ea = FIRST_EA(ealist); ea < END_EALIST(ealist); ea = NEXT_EA(ea)) { for (ea = FIRST_EA(ealist); ea < END_EALIST(ealist); ea = NEXT_EA(ea)) {
if (can_list(ea)) if (can_list(ea))
size += name_size(ea) + 1; size += name_size(ea) + 1;
} }
@ -1069,7 +1069,7 @@ ssize_t jfs_listxattr(struct dentry * dentry, char *data, size_t buf_size)
/* Copy attribute names to buffer */ /* Copy attribute names to buffer */
buffer = data; buffer = data;
for (ea = FIRST_EA(ealist); ea < END_EALIST(ealist); ea = NEXT_EA(ea)) { for (ea = FIRST_EA(ealist); ea < END_EALIST(ealist); ea = NEXT_EA(ea)) {
if (can_list(ea)) { if (can_list(ea)) {
int namelen = copy_name(buffer, ea); int namelen = copy_name(buffer, ea);
buffer += namelen + 1; buffer += namelen + 1;
} }