From dfc130f3902b31cae73782f45e2bc52004f384c1 Mon Sep 17 00:00:00 2001 From: Russell Cattelan Date: Wed, 16 Apr 2003 18:29:10 +0000 Subject: [PATCH] Merge whitespace changes over --- Makefile | 20 +-- Makepkgs | 2 +- configure.in | 8 +- db/Makefile | 20 +-- db/addr.c | 20 +-- db/addr.h | 20 +-- db/agf.c | 20 +-- db/agf.h | 20 +-- db/agfl.c | 24 +-- db/agfl.h | 20 +-- db/agi.c | 20 +-- db/agi.h | 20 +-- db/attr.c | 34 ++-- db/attr.h | 20 +-- db/attrshort.c | 26 +-- db/attrshort.h | 20 +-- db/bit.c | 124 ++++++------- db/bit.h | 20 +-- db/block.c | 30 ++-- db/block.h | 20 +-- db/bmap.c | 20 +-- db/bmap.h | 20 +-- db/bmapbt.c | 20 +-- db/bmapbt.h | 20 +-- db/bmroot.c | 20 +-- db/bmroot.h | 20 +-- db/bnobt.c | 20 +-- db/bnobt.h | 20 +-- db/check.c | 66 +++---- db/check.h | 20 +-- db/cntbt.c | 20 +-- db/cntbt.h | 20 +-- db/command.c | 20 +-- db/command.h | 20 +-- db/convert.c | 22 +-- db/convert.h | 20 +-- db/dbread.c | 20 +-- db/dbread.h | 20 +-- db/debug.c | 20 +-- db/debug.h | 20 +-- db/dir.c | 24 +-- db/dir.h | 20 +-- db/dir2.c | 22 +-- db/dir2.h | 20 +-- db/dir2sf.c | 20 +-- db/dir2sf.h | 20 +-- db/dirshort.c | 22 +-- db/dirshort.h | 20 +-- db/dquot.c | 20 +-- db/dquot.h | 20 +-- db/echo.c | 20 +-- db/echo.h | 20 +-- db/faddr.c | 22 +-- db/faddr.h | 20 +-- db/field.c | 26 +-- db/field.h | 24 +-- db/flist.c | 20 +-- db/flist.h | 22 +-- db/fprint.c | 24 +-- db/fprint.h | 20 +-- db/frag.c | 40 ++--- db/frag.h | 20 +-- db/freesp.c | 26 +-- db/freesp.h | 20 +-- db/hash.c | 20 +-- db/hash.h | 20 +-- db/help.c | 21 ++- db/help.h | 20 +-- db/init.c | 20 +-- db/init.h | 20 +-- db/inobt.c | 20 +-- db/inobt.h | 20 +-- db/inode.c | 20 +-- db/inode.h | 20 +-- db/input.c | 36 ++-- db/input.h | 20 +-- db/io.c | 72 ++++---- db/io.h | 20 +-- db/malloc.c | 20 +-- db/malloc.h | 20 +-- db/output.c | 20 +-- db/output.h | 20 +-- db/print.c | 20 +-- db/print.h | 20 +-- db/quit.c | 20 +-- db/quit.h | 20 +-- db/sb.c | 34 ++-- db/sb.h | 20 +-- db/sig.c | 20 +-- db/sig.h | 20 +-- db/strvec.c | 20 +-- db/strvec.h | 20 +-- db/text.c | 91 +++++----- db/text.h | 20 +-- db/type.c | 39 ++-- db/type.h | 20 +-- db/write.c | 106 +++++------ db/write.h | 20 +-- db/xfs_admin.sh | 20 +-- db/xfs_check.sh | 22 +-- db/xfs_check64.sh | 22 +-- db/xfs_ncheck.sh | 22 +-- db/xfs_ncheck64.sh | 22 +-- freeze/Makefile | 20 +-- freeze/xfs_freeze.c | 6 +- fsck/Makefile | 20 +-- fsck/xfs_fsck.c | 20 +-- growfs/Makefile | 20 +-- growfs/xfs_growfs.c | 36 ++-- growfs/xfs_info.sh | 20 +-- imap/Makefile | 20 +-- imap/xfs_imap.c | 22 +-- include/Makefile | 20 +-- include/builddefs.in | 22 +-- include/buildmacros | 28 +-- include/buildrules | 6 +- include/dvh.h | 10 +- include/fstyp.h | 20 +-- include/jdm.h | 22 +-- include/libxfs.h | 52 +++--- include/libxlog.h | 14 +- include/platform_defs.h.in | 22 +-- include/swab.h | 8 +- include/volume.h | 24 +-- include/xfs_acl.h | 12 +- include/xfs_ag.h | 152 ++++++++-------- include/xfs_alloc.h | 34 ++-- include/xfs_alloc_btree.h | 62 +++---- include/xfs_arch.h | 2 +- include/xfs_attr_leaf.h | 26 +-- include/xfs_attr_sf.h | 24 +-- include/xfs_bit.h | 20 +-- include/xfs_bmap.h | 64 +++---- include/xfs_btree.h | 158 ++++++++-------- include/xfs_buf_item.h | 44 ++--- include/xfs_cap.h | 10 +- include/xfs_da_btree.h | 42 ++--- include/xfs_dfrag.h | 4 +- include/xfs_dinode.h | 308 ++++++++++++++++---------------- include/xfs_dir.h | 32 ++-- include/xfs_dir2.h | 14 +- include/xfs_dir2_block.h | 14 +- include/xfs_dir2_data.h | 40 ++--- include/xfs_dir2_leaf.h | 74 ++++---- include/xfs_dir2_node.h | 24 +-- include/xfs_dir2_sf.h | 46 ++--- include/xfs_dir_leaf.h | 18 +- include/xfs_dir_sf.h | 50 +++--- include/xfs_extfree_item.h | 24 +-- include/xfs_ialloc.h | 32 ++-- include/xfs_ialloc_btree.h | 92 +++++----- include/xfs_imap.h | 4 +- include/xfs_inode.h | 132 +++++++------- include/xfs_inode_item.h | 64 +++---- include/xfs_inum.h | 82 ++++----- include/xfs_log.h | 20 +-- include/xfs_log_priv.h | 92 +++++----- include/xfs_log_recover.h | 16 +- include/xfs_mac.h | 44 ++--- include/xfs_mount.h | 80 ++++----- include/xfs_quota.h | 24 +-- include/xfs_rtalloc.h | 74 ++++---- include/xfs_sb.h | 144 +++++++-------- include/xfs_trans.h | 356 ++++++++++++++++++------------------- include/xfs_trans_space.h | 56 +++--- include/xfs_types.h | 68 +++---- include/xqm.h | 20 +-- io/Makefile | 20 +-- io/bmap.c | 98 +++++----- io/command.c | 22 +-- io/command.h | 20 +-- io/fsync.c | 20 +-- io/help.c | 20 +-- io/init.c | 22 +-- io/init.h | 22 +-- io/input.c | 22 +-- io/input.h | 20 +-- io/open.c | 22 +-- io/pread.c | 20 +-- io/prealloc.c | 20 +-- io/pwrite.c | 20 +-- io/quit.c | 20 +-- io/resblks.c | 20 +-- io/truncate.c | 20 +-- io/xfs_bmap.sh | 20 +-- libdisk/Makefile | 20 +-- libdisk/drivers.c | 22 +-- libdisk/drivers.h | 20 +-- libdisk/evms.c | 6 +- libdisk/evms.h | 6 +- libdisk/fstype.c | 72 ++++---- libdisk/fstype.h | 28 +-- libdisk/lvm.c | 20 +-- libdisk/md.c | 20 +-- libdisk/pttype.c | 24 +-- libdisk/pttype.h | 3 +- libdisk/xvm.c | 20 +-- libdisk/xvm.h | 15 +- libhandle/Makefile | 20 +-- libhandle/handle.c | 2 +- libhandle/jdm.c | 14 +- libxfs/Makefile | 24 +-- libxfs/freebsd.c | 18 +- libxfs/rdwr.c | 2 +- libxfs/xfs.h | 12 +- libxfs/xfs_alloc.c | 74 ++++---- libxfs/xfs_alloc_btree.c | 112 ++++++------ libxfs/xfs_attr_leaf.c | 10 +- libxfs/xfs_bmap.c | 184 +++++++++---------- libxfs/xfs_bmap_btree.c | 28 +-- libxfs/xfs_btree.c | 60 +++---- libxfs/xfs_da_btree.c | 26 +-- libxfs/xfs_dir.c | 3 +- libxfs/xfs_dir2.c | 10 +- libxfs/xfs_dir2_block.c | 2 +- libxfs/xfs_dir2_data.c | 6 +- libxfs/xfs_dir2_leaf.c | 7 +- libxfs/xfs_dir2_node.c | 23 ++- libxfs/xfs_dir2_sf.c | 6 +- libxfs/xfs_dir_leaf.c | 8 +- libxfs/xfs_ialloc.c | 30 ++-- libxfs/xfs_ialloc_btree.c | 69 +++---- libxfs/xfs_inode.c | 82 ++++----- libxfs/xfs_mount.c | 3 +- libxfs/xfs_rtalloc.c | 3 +- libxfs/xfs_trans.c | 2 +- libxlog/Makefile | 20 +-- libxlog/util.c | 80 ++++----- logprint/Makefile | 20 +-- logprint/log_misc.c | 268 ++++++++++++++-------------- logprint/log_print_all.c | 56 +++--- logprint/log_print_trans.c | 56 +++--- logprint/logprint.c | 80 ++++----- mkfile/Makefile | 20 +-- mkfile/xfs_mkfile.c | 22 +-- po/Makefile | 22 +-- repair/Makefile | 20 +-- repair/README | 33 ++-- repair/agheader.c | 20 +-- repair/agheader.h | 22 ++- repair/attr_repair.c | 172 +++++++++--------- repair/attr_repair.h | 20 +-- repair/avl.c | 96 +++++----- repair/avl.h | 30 ++-- repair/avl64.c | 96 +++++----- repair/avl64.h | 30 ++-- repair/bmap.c | 20 +-- repair/bmap.h | 20 +-- repair/dino_chunks.c | 30 ++-- repair/dinode.c | 54 +++--- repair/dinode.h | 24 +-- repair/dir.c | 42 ++--- repair/dir.h | 26 +-- repair/dir2.c | 32 ++-- repair/dir2.h | 20 +-- repair/dir_stack.c | 20 +-- repair/dir_stack.h | 20 +-- repair/err_protos.h | 20 +-- repair/globals.c | 21 ++- repair/globals.h | 20 +-- repair/incore.c | 36 ++-- repair/incore.h | 20 +-- repair/incore_bmc.c | 20 +-- repair/incore_ext.c | 28 +-- repair/incore_ino.c | 44 ++--- repair/init.c | 20 +-- repair/io.c | 20 +-- repair/phase1.c | 28 +-- repair/phase2.c | 24 +-- repair/phase3.c | 22 +-- repair/phase4.c | 30 ++-- repair/phase5.c | 24 +-- repair/phase6.c | 38 ++-- repair/phase7.c | 24 +-- repair/protos.h | 21 ++- repair/rt.c | 22 +-- repair/rt.h | 20 +-- repair/sb.c | 58 +++--- repair/scan.c | 38 ++-- repair/scan.h | 20 +-- repair/versions.c | 22 +-- repair/versions.h | 20 +-- repair/xfs_repair.c | 24 +-- rtcp/Makefile | 20 +-- rtcp/xfs_rtcp.c | 46 ++--- 285 files changed, 4729 insertions(+), 4741 deletions(-) diff --git a/Makefile b/Makefile index 552b8fc13..74b2b6401 100644 --- a/Makefile +++ b/Makefile @@ -1,32 +1,32 @@ # # Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # diff --git a/Makepkgs b/Makepkgs index e3f9e0caa..d5583b44a 100755 --- a/Makepkgs +++ b/Makepkgs @@ -1,5 +1,5 @@ #! /bin/sh -# +# # Make whichever packages have been requested. # Defaults to RPMs. # diff --git a/configure.in b/configure.in index 43a4d02ac..b618aca67 100644 --- a/configure.in +++ b/configure.in @@ -237,9 +237,9 @@ AC_SUBST(libuuid) dnl Check if we have a type for the pointer's size integer (__psint_t) AC_MSG_CHECKING([for __psint_t ]) AC_TRY_COMPILE( -[ +[ #include - #include + #include #include ], [ @@ -249,9 +249,9 @@ AC_TRY_COMPILE( dnl Check if we have a type for the pointer's size unsigned (__psunsigned_t) AC_MSG_CHECKING([for __psunsigned_t ]) AC_TRY_COMPILE( -[ +[ #include - #include + #include #include ], [ diff --git a/db/Makefile b/db/Makefile index bede36fed..b98459d07 100644 --- a/db/Makefile +++ b/db/Makefile @@ -1,32 +1,32 @@ # # Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # diff --git a/db/addr.c b/db/addr.c index 85e6d875b..cab213a63 100644 --- a/db/addr.c +++ b/db/addr.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/addr.h b/db/addr.h index ec8c581b5..1e4ca87fb 100644 --- a/db/addr.h +++ b/db/addr.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/agf.c b/db/agf.c index 3b63418f7..cbbe97248 100644 --- a/db/agf.c +++ b/db/agf.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/agf.h b/db/agf.h index f3eb74578..92be8bf9e 100644 --- a/db/agf.h +++ b/db/agf.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/agfl.c b/db/agfl.c index 21837cf79..819d1f01f 100644 --- a/db/agfl.c +++ b/db/agfl.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -47,7 +47,7 @@ static int agfl_f(int argc, char **argv); static void agfl_help(void); static const cmdinfo_t agfl_cmd = - { "agfl", NULL, agfl_f, 0, 1, 1, "[agno]", + { "agfl", NULL, agfl_f, 0, 1, 1, "[agno]", "set address to agfl block", agfl_help }; const field_t agfl_hfld[] = { { @@ -83,7 +83,7 @@ agfl_help(void) "\n" " Located in the fourth sector of each allocation group,\n" " the agfl freelist for internal btree space allocation is maintained\n" -" for each allocation group. This acts as a reserved pool of space\n" +" for each allocation group. This acts as a reserved pool of space\n" " separate from the general filesystem freespace (not used for user data).\n" "\n" ); diff --git a/db/agfl.h b/db/agfl.h index a4db4c482..fda7b290e 100644 --- a/db/agfl.h +++ b/db/agfl.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/agi.c b/db/agi.c index 2b647d7e5..0b7c24b90 100644 --- a/db/agi.c +++ b/db/agi.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/agi.h b/db/agi.h index 34dde6e7a..f4bb791f6 100644 --- a/db/agi.h +++ b/db/agi.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/attr.c b/db/attr.c index 03aa5579c..9d512f947 100644 --- a/db/attr.c +++ b/db/attr.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -166,7 +166,7 @@ attr_leaf_entries_count( int startoff) { xfs_attr_leafblock_t *block; - + ASSERT(startoff == 0); block = obj; if (INT_GET(block->hdr.info.magic, ARCH_CONVERT) @@ -184,7 +184,7 @@ attr_leaf_hdr_count( int startoff) { xfs_attr_leafblock_t *block; - + ASSERT(startoff == 0); block = obj; return INT_GET(block->hdr.info.magic, ARCH_CONVERT) @@ -296,14 +296,14 @@ attr_leaf_name_local_value_offset( if (INT_GET(block->hdr.info.magic, ARCH_CONVERT) != XFS_ATTR_LEAF_MAGIC) return 0; - + for (i = 0; i < INT_GET(block->hdr.count, ARCH_CONVERT); i++) { e = &block->entries[i]; if (INT_GET(e->nameidx, ARCH_CONVERT) == off) - break; + break; } - if (i>=INT_GET(block->hdr.count, ARCH_CONVERT)) return 0; - + if (i>=INT_GET(block->hdr.count, ARCH_CONVERT)) return 0; + l = XFS_ATTR_LEAF_NAME_LOCAL(block, i); vp = (char *)&l->nameval[l->namelen]; return (int)bitize(vp - (char *)l); @@ -446,7 +446,7 @@ attr_node_hdr_count( int startoff) { xfs_da_intnode_t *block; - + ASSERT(startoff == 0); block = obj; return INT_GET(block->hdr.info.magic, ARCH_CONVERT) diff --git a/db/attr.h b/db/attr.h index 54186c2a2..af96ede52 100644 --- a/db/attr.h +++ b/db/attr.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/attrshort.c b/db/attrshort.c index e9a8fb23a..bdbed1a67 100644 --- a/db/attrshort.c +++ b/db/attrshort.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -80,7 +80,7 @@ attr_sf_entry_name_count( int startoff) { xfs_attr_sf_entry_t *e; - + ASSERT(bitoffs(startoff) == 0); e = (xfs_attr_sf_entry_t *)((char *)obj + byteize(startoff)); return e->namelen; @@ -110,7 +110,7 @@ attr_sf_entry_value_count( int startoff) { xfs_attr_sf_entry_t *e; - + ASSERT(bitoffs(startoff) == 0); e = (xfs_attr_sf_entry_t *)((char *)obj + byteize(startoff)); return e->valuelen; @@ -124,7 +124,7 @@ attr_sf_entry_value_offset( int idx) { xfs_attr_sf_entry_t *e; - + ASSERT(bitoffs(startoff) == 0); ASSERT(idx == 0); e = (xfs_attr_sf_entry_t *)((char *)obj + byteize(startoff)); diff --git a/db/attrshort.h b/db/attrshort.h index 29d0ceb20..ce6cc4af4 100644 --- a/db/attrshort.h +++ b/db/attrshort.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/bit.c b/db/bit.c index a83c07133..3791d7e81 100644 --- a/db/bit.c +++ b/db/bit.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -87,8 +87,8 @@ getbitval( __int64_t rval; int signext; int z1, z2, z3, z4; - - ASSERT(nbits<=64); + + ASSERT(nbits<=64); p = (char *)obj + byteize(bitoff); bit = bitoffs(bitoff); @@ -121,24 +121,24 @@ getbitval( else return (__int64_t)INT_GET(*(__uint8_t *)p, ARCH_CONVERT); } - - + + for (i = 0, rval = 0LL; i < nbits; i++) { if (getbit(p, bit + i)) { - /* If the last bit is on and we care about sign - * bits and we don't have a full 64 bit - * container, turn all bits on between the - * sign bit and the most sig bit. - */ - - /* handle endian swap here */ + /* If the last bit is on and we care about sign + * bits and we don't have a full 64 bit + * container, turn all bits on between the + * sign bit and the most sig bit. + */ + + /* handle endian swap here */ #if __BYTE_ORDER == LITTLE_ENDIAN if (i == 0 && signext && nbits < 64) rval = -1LL << nbits; rval |= 1LL << (nbits - i - 1); #else if ((i == (nbits - 1)) && signext && nbits < 64) - rval |= (-1LL << nbits); + rval |= (-1LL << nbits); rval |= 1LL << (nbits - i - 1); #endif } @@ -155,48 +155,48 @@ setbitval( { char *in = (char *)ibuf; char *out = (char *)obuf; - + int bit; - + #if BYTE_ORDER == LITTLE_ENDIAN - int big = 0; + int big = 0; #else - int big = 1; + int big = 1; #endif - - /* only need to swap LE integers */ - if (big || (nbits!=16 && nbits!=32 && nbits!=64) ) { - /* We don't have type info, so we can only assume - * that 2,4 & 8 byte values are integers. sigh. - */ - - /* byte aligned ? */ - if (bitoff%NBBY) { - /* no - bit copy */ - for (bit=0; bitname[namelen] = '\0'; } -static void +static void addparent_inode( inodata_t *id, xfs_ino_t parent) @@ -827,7 +827,7 @@ blockget_f( for (agno = 0; agno < mp->m_sb.sb_agcount; agno++) { /* * Check that there are no blocks either - * a) unaccounted for or + * a) unaccounted for or * b) bno-free but not cnt-free */ checknot_dbmap(agno, 0, mp->m_sb.sb_agblocks, @@ -1335,7 +1335,7 @@ check_linkcounts( ep = ep->next; } } - + } static int @@ -2083,7 +2083,7 @@ process_btinode( if (!sflag || id->ilist) dbprintf("numrecs for ino %lld %s fork bmap root too " "large (%u)\n", - id->ino, + id->ino, whichfork == XFS_DATA_FORK ? "data" : "attr", INT_GET(dib->bb_numrecs, ARCH_CONVERT)); error++; @@ -2593,7 +2593,7 @@ process_inode( "dev", "local", "extents", "btree", "uuid" }; - /* convert the core, then copy it back into the inode */ + /* convert the core, then copy it back into the inode */ libxfs_xlate_dinode_core((xfs_caddr_t)&dip->di_core, &tdic, 1, ARCH_CONVERT); memcpy(&dip->di_core, &tdic, sizeof(xfs_dinode_core_t)); @@ -2929,7 +2929,7 @@ process_leaf_dir_v1_int( entry = &leaf->entries[0]; for (i = 0; i < INT_GET(leaf->hdr.count, ARCH_CONVERT); entry++, i++) { namest = XFS_DIR_LEAF_NAMESTRUCT(leaf, INT_GET(entry->nameidx, ARCH_CONVERT)); - lino=DIRINO_GET_ARCH(&namest->inumber, ARCH_CONVERT); + lino=DIRINO_GET_ARCH(&namest->inumber, ARCH_CONVERT); cid = find_inode(lino, 1); if (v) dbprintf("dir %lld entry %*.*s %lld\n", id->ino, @@ -3199,7 +3199,7 @@ process_leaf_node_dir_v2_int( } break; case XFS_DIR2_LEAFN_MAGIC: - /* if it's at the root location then we can check the + /* if it's at the root location then we can check the * pointers are null XXX */ break; case XFS_DA_NODE_MAGIC: @@ -3349,7 +3349,7 @@ process_quota( if ((dqb = iocur_top->data) == NULL) { pop_cur(); if (scicb) - dbprintf("can't read block %lld for %s quota " + dbprintf("can't read block %lld for %s quota " "inode (fsblock %lld)\n", (xfs_dfiloff_t)qbno, s, (xfs_dfsbno_t)bno); @@ -3366,7 +3366,7 @@ process_quota( INT_GET(dqb->dd_diskdq.d_rtbcount, ARCH_CONVERT)); if (INT_GET(dqb->dd_diskdq.d_magic, ARCH_CONVERT) != XFS_DQUOT_MAGIC) { if (scicb) - dbprintf("bad magic number %#x for %s " + dbprintf("bad magic number %#x for %s " "dqblk %lld entry %d id %d\n", INT_GET(dqb->dd_diskdq.d_magic, ARCH_CONVERT), s, (xfs_dfiloff_t)qbno, i, dqid); @@ -3656,7 +3656,7 @@ process_shortform_dir_v1( (*dot)++; sfe = &sf->list[0]; for (i = INT_GET(sf->hdr.count, ARCH_CONVERT) - 1; i >= 0; i--) { - lino = DIRINO_GET_ARCH(&sfe->inumber, ARCH_CONVERT); + lino = DIRINO_GET_ARCH(&sfe->inumber, ARCH_CONVERT); cid = find_inode(lino, 1); if (cid == NULL) { if (!sflag) @@ -3680,7 +3680,7 @@ process_shortform_dir_v1( dbprintf("dir %llu size is %lld, should be %d\n", id->ino, dip->di_core.di_size, (int)((char *)sfe - (char *)sf)); - lino=DIRINO_GET_ARCH(&sf->hdr.parent, ARCH_CONVERT); + lino=DIRINO_GET_ARCH(&sf->hdr.parent, ARCH_CONVERT); cid = find_inode(lino, 1); if (cid) addlink_inode(cid); @@ -3823,16 +3823,16 @@ scan_ag( set_cur(&typtab[TYP_SB], XFS_AG_DADDR(mp, agno, XFS_SB_DADDR), XFS_FSS_TO_BB(mp, 1), DB_RING_IGN, NULL); - + if (!iocur_top->data) { dbprintf("can't read superblock for ag %u\n", agno); pop_cur(); serious_error++; return; } - + libxfs_xlate_sb(iocur_top->data, sb, 1, ARCH_CONVERT, XFS_SB_ALL_BITS); - + if (sb->sb_magicnum != XFS_SB_MAGIC) { if (!sflag) dbprintf("bad sb magic # %#x in ag %u\n", @@ -3959,11 +3959,11 @@ scan_ag( for (i = 0; i < XFS_AGI_UNLINKED_BUCKETS; i++) { if (INT_GET(agi->agi_unlinked[i], ARCH_CONVERT) != NULLAGINO) { if (!sflag) { - xfs_agino_t agino=INT_GET(agi->agi_unlinked[i], ARCH_CONVERT); + xfs_agino_t agino=INT_GET(agi->agi_unlinked[i], ARCH_CONVERT); dbprintf("agi unlinked bucket %d is %u in ag " "%u (inode=%lld)\n", i, agino, agno, - XFS_AGINO_TO_INO(mp, agno, agino)); - } + XFS_AGINO_TO_INO(mp, agno, agino)); + } error++; } } diff --git a/db/check.h b/db/check.h index c7c342ba4..18ee16a5b 100644 --- a/db/check.h +++ b/db/check.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/cntbt.c b/db/cntbt.c index db739e1a1..b241daf4a 100644 --- a/db/cntbt.c +++ b/db/cntbt.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/cntbt.h b/db/cntbt.h index dab7121ea..061939173 100644 --- a/db/cntbt.h +++ b/db/cntbt.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/command.c b/db/command.c index 3aaff1ead..c23fd04bf 100644 --- a/db/command.c +++ b/db/command.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/command.h b/db/command.h index c218aeead..e6417fad2 100644 --- a/db/command.h +++ b/db/command.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/convert.c b/db/convert.c index 6a9cb0aa7..357777fac 100644 --- a/db/convert.c +++ b/db/convert.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -55,7 +55,7 @@ ((__uint64_t)(x) << mp->m_sb.sb_inodelog) typedef enum { - CT_NONE = -1, + CT_NONE = -1, CT_AGBLOCK, /* xfs_agblock_t */ CT_AGINO, /* xfs_agino_t */ CT_AGNUMBER, /* xfs_agno_t */ diff --git a/db/convert.h b/db/convert.h index b4348ced9..3aa6ca471 100644 --- a/db/convert.h +++ b/db/convert.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/dbread.c b/db/dbread.c index 129ca690b..d1ddeb9b2 100644 --- a/db/dbread.c +++ b/db/dbread.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/dbread.h b/db/dbread.h index ba3ffdd6d..19ca7767f 100644 --- a/db/dbread.h +++ b/db/dbread.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/debug.c b/db/debug.c index dfd3215e0..6d1867a08 100644 --- a/db/debug.c +++ b/db/debug.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/debug.h b/db/debug.h index afb3be31e..3e48efc6f 100644 --- a/db/debug.h +++ b/db/debug.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/dir.c b/db/dir.c index e788eb8cd..23458b611 100644 --- a/db/dir.c +++ b/db/dir.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -137,7 +137,7 @@ dir_leaf_entries_count( int startoff) { xfs_dir_leafblock_t *block; - + ASSERT(startoff == 0); block = obj; if (INT_GET(block->hdr.info.magic, ARCH_CONVERT) != XFS_DIR_LEAF_MAGIC) @@ -152,7 +152,7 @@ dir_leaf_hdr_count( int startoff) { xfs_dir_leafblock_t *block; - + ASSERT(startoff == 0); block = obj; return INT_GET(block->hdr.info.magic, ARCH_CONVERT) == XFS_DIR_LEAF_MAGIC; diff --git a/db/dir.h b/db/dir.h index bcbed1ea6..76a5eab3a 100644 --- a/db/dir.h +++ b/db/dir.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/dir2.c b/db/dir2.c index 7ca408df4..8c48e54a5 100644 --- a/db/dir2.c +++ b/db/dir2.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -649,7 +649,7 @@ dir2_leaf_hdr_count( int startoff) { xfs_dir2_leaf_t *leaf; - + ASSERT(startoff == 0); leaf = obj; return INT_GET(leaf->hdr.info.magic, ARCH_CONVERT) == XFS_DIR2_LEAF1_MAGIC || diff --git a/db/dir2.h b/db/dir2.h index 606cb7f48..cb920ed1d 100644 --- a/db/dir2.h +++ b/db/dir2.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/dir2sf.c b/db/dir2sf.c index 15941deb0..cd0a2c9ed 100644 --- a/db/dir2sf.c +++ b/db/dir2sf.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/dir2sf.h b/db/dir2sf.h index 462ceafdf..886702002 100644 --- a/db/dir2sf.h +++ b/db/dir2sf.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/dirshort.c b/db/dirshort.c index c9a70ac4b..041a35070 100644 --- a/db/dirshort.c +++ b/db/dirshort.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -72,7 +72,7 @@ dir_sf_entry_name_count( int startoff) { xfs_dir_sf_entry_t *e; - + ASSERT(bitoffs(startoff) == 0); e = (xfs_dir_sf_entry_t *)((char *)obj + byteize(startoff)); return e->namelen; diff --git a/db/dirshort.h b/db/dirshort.h index 5f8867620..5c42f419c 100644 --- a/db/dirshort.h +++ b/db/dirshort.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/dquot.c b/db/dquot.c index 6c2d767c7..774068028 100644 --- a/db/dquot.c +++ b/db/dquot.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/dquot.h b/db/dquot.h index f4d8cce44..ae9c1429b 100644 --- a/db/dquot.h +++ b/db/dquot.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/echo.c b/db/echo.c index a5b3a2b5c..d939114ce 100644 --- a/db/echo.c +++ b/db/echo.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/echo.h b/db/echo.h index c801572bb..fba0e6a11 100644 --- a/db/echo.h +++ b/db/echo.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/faddr.c b/db/faddr.c index 427e305e2..61a310cc2 100644 --- a/db/faddr.c +++ b/db/faddr.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -308,7 +308,7 @@ fa_dirblock( if (nex > 1) make_bbmap(&bbmap, nex, bmp); set_cur(&typtab[next], (__int64_t)XFS_FSB_TO_DADDR(mp, dfsbno), - XFS_FSB_TO_BB(mp, mp->m_dirblkfsbs), DB_RING_ADD, + XFS_FSB_TO_BB(mp, mp->m_dirblkfsbs), DB_RING_ADD, nex > 1 ? &bbmap : NULL); free(bmp); } diff --git a/db/faddr.h b/db/faddr.h index f89e16238..c9f3f3418 100644 --- a/db/faddr.h +++ b/db/faddr.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/field.c b/db/field.c index 53bcc5927..fd56668d4 100644 --- a/db/field.c +++ b/db/field.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -364,12 +364,12 @@ const field_t * findfield( char *name, const field_t *fields, - void *obj, - int startoff) + void *obj, + int startoff) { const field_t *f; - /* we only match if this field name matches and has a non-zero count */ + /* we only match if this field name matches and has a non-zero count */ for (f = fields; f->name; f++) if (strcmp(f->name, name) == 0 && fcount(f, obj, startoff)) return f; diff --git a/db/field.h b/db/field.h index 5b4648b93..95d9dbefa 100644 --- a/db/field.h +++ b/db/field.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -219,6 +219,6 @@ extern int bitoffset(const field_t *f, void *obj, int startoff, int idx); extern int fcount(const field_t *f, void *obj, int startoff); extern const field_t *findfield(char *name, const field_t *fields, - void *obj, int startoff); + void *obj, int startoff); extern int fsize(const field_t *f, void *obj, int startoff, - int idx); + int idx); diff --git a/db/flist.c b/db/flist.c index 858b3722f..e566097f6 100644 --- a/db/flist.c +++ b/db/flist.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/flist.h b/db/flist.h index c3c90fe6a..c6b704988 100644 --- a/db/flist.h +++ b/db/flist.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -34,7 +34,7 @@ struct field; typedef struct flist { char *name; - const struct field *fld; + const struct field *fld; struct flist *child; struct flist *sibling; int low; diff --git a/db/fprint.c b/db/fprint.c index 64064a8e2..e5bf2e7cd 100644 --- a/db/fprint.c +++ b/db/fprint.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -152,7 +152,7 @@ fp_time( int bitpos; char *c; int i; - time_t t; + time_t t; ASSERT(bitoffs(bit) == 0); for (i = 0, bitpos = bit; @@ -160,7 +160,7 @@ fp_time( i++, bitpos += size) { if (array) dbprintf("%d:", i + base); - t=(time_t)getbitval((char *)obj + byteize(bitpos), 0, sizeof(int32_t)*8, 0); + t=(time_t)getbitval((char *)obj + byteize(bitpos), 0, sizeof(int32_t)*8, 0); c = ctime(&t); dbprintf("%24.24s", c); if (i < count - 1) diff --git a/db/fprint.h b/db/fprint.h index 86394c458..1c9c41e1f 100644 --- a/db/fprint.h +++ b/db/fprint.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/frag.c b/db/frag.c index af0b13890..d0b3a8c0b 100644 --- a/db/frag.c +++ b/db/frag.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -101,7 +101,7 @@ static void scanfunc_bmap(xfs_btree_lblock_t *ablock, int level, static void scanfunc_ino(xfs_btree_sblock_t *ablock, int level, xfs_agf_t *agf); -static const cmdinfo_t frag_cmd = +static const cmdinfo_t frag_cmd = { "frag", NULL, frag_f, 0, -1, 0, "[-a] [-d] [-f] [-l] [-r]", "get file fragmentation data", NULL }; @@ -508,16 +508,16 @@ scanfunc_ino( continue; } for (j = 0; j < XFS_INODES_PER_CHUNK; j++) { - xfs_dinode_t *dip; - xfs_dinode_core_t tdic; - - dip=(xfs_dinode_t *)((char *)iocur_top->data + ((off + j) << mp->m_sb.sb_inodelog)); - - /* convert the core, then copy it back into the inode */ - libxfs_xlate_dinode_core( (xfs_caddr_t) + xfs_dinode_t *dip; + xfs_dinode_core_t tdic; + + dip=(xfs_dinode_t *)((char *)iocur_top->data + ((off + j) << mp->m_sb.sb_inodelog)); + + /* convert the core, then copy it back into the inode */ + libxfs_xlate_dinode_core( (xfs_caddr_t) &dip->di_core, &tdic, 1, ARCH_CONVERT ); - memcpy(&dip->di_core, &tdic, sizeof(xfs_dinode_core_t)); - + memcpy(&dip->di_core, &tdic, sizeof(xfs_dinode_core_t)); + if (XFS_INOBT_IS_FREE(&rp[i], j, ARCH_CONVERT)) continue; process_inode(agf, agino + j, diff --git a/db/frag.h b/db/frag.h index 146b65f56..d1886513f 100644 --- a/db/frag.h +++ b/db/frag.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/freesp.c b/db/freesp.c index 0e5887404..bdbcc4e5f 100644 --- a/db/freesp.c +++ b/db/freesp.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -81,7 +81,7 @@ static long long totexts; static const cmdinfo_t freesp_cmd = { "freesp", NULL, freesp_f, 0, -1, 0, - "[-bcdfs] [-a agno]... [-e binsize] [-h h1]... [-m binmult]", + "[-bcdfs] [-a agno]... [-e binsize] [-h h1]... [-m binmult]", "summarize free space for filesystem", NULL }; static int @@ -163,7 +163,7 @@ init( aglistadd(optarg); break; case 'b': - if (speced) + if (speced) return usage(); multsize = 2; speced = 1; @@ -288,7 +288,7 @@ scan_sbtree( blkbb, DB_RING_IGN, NULL); if (iocur_top->data == NULL) { dbprintf("can't read btree block %u/%u\n", seqno, root); - return; + return; } (*func)((xfs_btree_sblock_t *)iocur_top->data, typ, nlevels - 1, agf); pop_cur(); diff --git a/db/freesp.h b/db/freesp.h index f3706b214..60388be78 100644 --- a/db/freesp.h +++ b/db/freesp.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/hash.c b/db/hash.c index 6ee8c2d58..8174652c5 100644 --- a/db/hash.c +++ b/db/hash.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/hash.h b/db/hash.h index 9c2e51da7..bbe5e93e7 100644 --- a/db/hash.h +++ b/db/hash.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/help.c b/db/help.c index b36f1376e..0f0aa22cc 100644 --- a/db/help.c +++ b/db/help.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -106,4 +106,3 @@ help_oneline( dbprintf("%s ", ct->args); dbprintf("-- %s\n", ct->oneline); } - diff --git a/db/help.h b/db/help.h index b5fe02d79..7cf53f931 100644 --- a/db/help.h +++ b/db/help.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/init.c b/db/init.c index ec75489b0..4a684362c 100644 --- a/db/init.c +++ b/db/init.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/init.h b/db/init.h index 545459821..903c0e948 100644 --- a/db/init.h +++ b/db/init.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/inobt.c b/db/inobt.c index dc0633bad..e170c3fcb 100644 --- a/db/inobt.c +++ b/db/inobt.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/inobt.h b/db/inobt.h index d73355f84..7bd339fc6 100644 --- a/db/inobt.h +++ b/db/inobt.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/inode.c b/db/inode.c index a89e2e3d8..844b833ce 100644 --- a/db/inode.c +++ b/db/inode.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/inode.h b/db/inode.h index b6a8e4e72..6682e2809 100644 --- a/db/inode.h +++ b/db/inode.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/input.c b/db/input.c index 5cd6f4013..f92b2f095 100644 --- a/db/input.c +++ b/db/input.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -257,17 +257,17 @@ popfile(void) } if (curinput != stdin) fclose(curinput); - + inputstacksize--; - if (inputstacksize) { + if (inputstacksize) { inputstack = xrealloc(inputstack, inputstacksize * sizeof(*inputstack)); - curinput = inputstack[inputstacksize - 1]; - } else { - free(inputstack); - curinput = NULL; - inputstack = NULL; - } + curinput = inputstack[inputstacksize - 1]; + } else { + free(inputstack); + curinput = NULL; + inputstack = NULL; + } } void diff --git a/db/input.h b/db/input.h index e96f09aa7..0376bf2d3 100644 --- a/db/input.h +++ b/db/input.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/io.c b/db/io.c index ad2f978a5..53ab56961 100644 --- a/db/io.c +++ b/db/io.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -64,13 +64,13 @@ static const cmdinfo_t push_cmd = static const cmdinfo_t stack_cmd = { "stack", NULL, stack_f, 0, 0, 0, NULL, "view the location stack", stack_help }; -static const cmdinfo_t forward_cmd = +static const cmdinfo_t forward_cmd = { "forward", "f", forward_f, 0, 0, 0, NULL, "move forward to next entry in the position ring", forward_help }; -static const cmdinfo_t back_cmd = +static const cmdinfo_t back_cmd = { "back", "b", back_f, 0, 0, 0, NULL, "move to the previous location in the position ring", back_help }; -static const cmdinfo_t ring_cmd = +static const cmdinfo_t ring_cmd = { "ring", NULL, ring_f, 0, 1, 0, NULL, "show position ring or move to a specific entry", ring_help }; @@ -233,30 +233,30 @@ push_f( const cmdinfo_t *ct; if (argc > 1) { - /* check we can execute command */ - ct = find_command(argv[1]); - if (ct == NULL) { - dbprintf("no such command %s\n", argv[1]); - return 0; - } - if (!ct->canpush) { - dbprintf("no push form allowed for %s\n", argv[1]); - return 0; - } - } - - /* save current state */ - push_cur(); + /* check we can execute command */ + ct = find_command(argv[1]); + if (ct == NULL) { + dbprintf("no such command %s\n", argv[1]); + return 0; + } + if (!ct->canpush) { + dbprintf("no push form allowed for %s\n", argv[1]); + return 0; + } + } + + /* save current state */ + push_cur(); if (iocur_top[-1].typ && iocur_top[-1].typ->typnm == TYP_INODE) set_cur_inode(iocur_top[-1].ino); else set_cur(iocur_top[-1].typ, iocur_top[-1].bb, - iocur_top[-1].blen, DB_RING_IGN, + iocur_top[-1].blen, DB_RING_IGN, iocur_top[-1].use_bbmap ? &iocur_top[-1].bbmap : NULL); - /* run requested command */ - if (argc>1) - (void)command(argc-1, argv+1); + /* run requested command */ + if (argc>1) + (void)command(argc-1, argv+1); return 0; } @@ -458,7 +458,7 @@ write_bbs( rval = errno; } else if (i < c) { rval = -1; - } else + } else rval = 0; if (rval) break; @@ -478,7 +478,7 @@ read_bbs( int i; int j; int rval = EINVAL; - + if (count <= 0) count = 1; @@ -509,7 +509,7 @@ read_bbs( if (*bufp == NULL) xfree(buf); buf = NULL; - } else + } else rval = 0; } if (buf == NULL) @@ -532,7 +532,7 @@ write_cur(void) ret = write_bbs(iocur_top->bb, iocur_top->blen, iocur_top->buf, iocur_top->use_bbmap ? &iocur_top->bbmap : NULL); if (ret == -1) - dbprintf("incomplete write, block: %lld\n", + dbprintf("incomplete write, block: %lld\n", (iocur_base + iocur_sp)->bb); else if (ret != 0) dbprintf("write error: %s\n", strerror(ret)); @@ -549,7 +549,7 @@ write_cur(void) void set_cur( const typ_t *t, - __int64_t d, + __int64_t d, int c, int ring_flag, bbmap_t *bbmap) diff --git a/db/io.h b/db/io.h index 29ab84a21..02f6237dd 100644 --- a/db/io.h +++ b/db/io.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/malloc.c b/db/malloc.c index 3def54096..9811c2147 100644 --- a/db/malloc.c +++ b/db/malloc.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/malloc.h b/db/malloc.h index 50f53fdaf..f256a35d9 100644 --- a/db/malloc.h +++ b/db/malloc.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/output.c b/db/output.c index 495a30521..d8e5510e0 100644 --- a/db/output.c +++ b/db/output.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/output.h b/db/output.h index a925c0212..2107183b2 100644 --- a/db/output.h +++ b/db/output.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/print.c b/db/print.c index d91367ca4..b30b2957e 100644 --- a/db/print.c +++ b/db/print.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/print.h b/db/print.h index 756f731b9..c4c3ce916 100644 --- a/db/print.h +++ b/db/print.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/quit.c b/db/quit.c index e3f9e65bb..5dbeb7299 100644 --- a/db/quit.c +++ b/db/quit.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/quit.h b/db/quit.h index 6592bcfca..5d020f290 100644 --- a/db/quit.h +++ b/db/quit.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/sb.c b/db/sb.c index 83aa66966..26739839c 100644 --- a/db/sb.c +++ b/db/sb.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -190,7 +190,7 @@ get_sb(xfs_agnumber_t agno, xfs_sb_t *sb) set_cur(&typtab[TYP_SB], XFS_AG_DADDR(mp, agno, XFS_SB_DADDR), XFS_FSS_TO_BB(mp, 1), DB_RING_IGN, NULL); - + if (!iocur_top->data) { dbprintf("can't read superblock for AG %u\n", agno); pop_cur(); @@ -198,20 +198,20 @@ get_sb(xfs_agnumber_t agno, xfs_sb_t *sb) } libxfs_xlate_sb(iocur_top->data, sb, 1, ARCH_CONVERT, XFS_SB_ALL_BITS); - + if (sb->sb_magicnum != XFS_SB_MAGIC) { dbprintf("bad sb magic # %#x in AG %u\n", sb->sb_magicnum, agno); - return 0; + return 0; } if (!XFS_SB_GOOD_VERSION(sb)) { dbprintf("bad sb version # %#x in AG %u\n", sb->sb_versionnum, agno); - return 0; + return 0; } if (agno == 0 && sb->sb_inprogress != 0) { dbprintf("mkfs not completed successfully\n"); - return 0; + return 0; } return 1; } @@ -384,7 +384,7 @@ uuid_f( return 0; } else { /* READ+CHECK UUID */ - + for (agno = 0; agno < mp->m_sb.sb_agcount; agno++) { uup = do_uuid(agno, NULL); if (!uup) { @@ -446,7 +446,7 @@ do_label(xfs_agnumber_t agno, char *label) { size_t len; xfs_sb_t tsb; - static char lbl[sizeof(tsb.sb_fname) + 1]; + static char lbl[sizeof(tsb.sb_fname) + 1]; if (!get_sb(agno, &tsb)) return NULL; diff --git a/db/sb.h b/db/sb.h index f5e52d3b5..0ec544f39 100644 --- a/db/sb.h +++ b/db/sb.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/sig.c b/db/sig.c index fecac3602..7c17f1957 100644 --- a/db/sig.c +++ b/db/sig.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/sig.h b/db/sig.h index f80fbba24..527baf938 100644 --- a/db/sig.h +++ b/db/sig.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/strvec.c b/db/strvec.c index a7a3f9f33..a85eaf56c 100644 --- a/db/strvec.c +++ b/db/strvec.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/strvec.h b/db/strvec.h index 4a769c7f7..eb5dc78ef 100644 --- a/db/strvec.h +++ b/db/strvec.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/text.c b/db/text.c index ec4b3b70e..777120020 100644 --- a/db/text.c +++ b/db/text.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -48,53 +48,52 @@ static void print_rawtext(void *data, int len); void print_text( - const field_t *fields, - int argc, - char **argv) + const field_t *fields, + int argc, + char **argv) { - print_rawtext(iocur_top->data, iocur_top->len); + print_rawtext(iocur_top->data, iocur_top->len); } static void print_rawtext( - void *data, - int len) + void *data, + int len) { - int i; - int j; - int lastaddr; - int offchars; - unsigned char *p; + int i; + int j; + int lastaddr; + int offchars; + unsigned char *p; - lastaddr = (len - 1) & ~(16 - 1); - if (lastaddr < 0x10) - offchars = 1; - else if (lastaddr < 0x100) - offchars = 2; - else if (lastaddr < 0x1000) - offchars = 3; - else - offchars = 4; + lastaddr = (len - 1) & ~(16 - 1); + if (lastaddr < 0x10) + offchars = 1; + else if (lastaddr < 0x100) + offchars = 2; + else if (lastaddr < 0x1000) + offchars = 3; + else + offchars = 4; - for (i = 0, p = data; i < len; i += 16) { - unsigned char *s = p; + for (i = 0, p = data; i < len; i += 16) { + unsigned char *s = p; - dbprintf("%-0*.*x: ", offchars, offchars, i); + dbprintf("%-0*.*x: ", offchars, offchars, i); - for (j = 0; j < 16 && i + j < len; j++, p++) { - dbprintf("%02x ", *p); - } + for (j = 0; j < 16 && i + j < len; j++, p++) { + dbprintf("%02x ", *p); + } - dbprintf(" "); + dbprintf(" "); - for (j = 0; j < 16 && i + j < len; j++, s++) { - if (isalnum(*s)) - dbprintf("%c", *s); - else - dbprintf(".", *s); - } + for (j = 0; j < 16 && i + j < len; j++, s++) { + if (isalnum(*s)) + dbprintf("%c", *s); + else + dbprintf(".", *s); + } - dbprintf("\n"); - } + dbprintf("\n"); + } } - diff --git a/db/text.h b/db/text.h index 021faddff..5c703a676 100644 --- a/db/text.h +++ b/db/text.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/type.c b/db/type.c index 2cc34db03..f774c3b47 100644 --- a/db/type.c +++ b/db/type.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -91,7 +91,7 @@ const typ_t typtab[] = { { TYP_RTSUMMARY, "rtsummary", NULL, NULL }, { TYP_SB, "sb", handle_struct, sb_hfld }, { TYP_SYMLINK, "symlink", handle_string, NULL }, - { TYP_TEXT, "text", handle_text, NULL }, + { TYP_TEXT, "text", handle_text, NULL }, { TYP_NONE, NULL } }; @@ -134,18 +134,18 @@ type_f( } } - + } else { tt = findtyp(argv[1]); if (tt == NULL) { dbprintf("no such type %s\n", argv[1]); - } else { - if (iocur_top->typ == NULL) { - dbprintf("no current object\n"); - } else { - iocur_top->typ = cur_typ = tt; - } - } + } else { + if (iocur_top->typ == NULL) { + dbprintf("no current object\n"); + } else { + iocur_top->typ = cur_typ = tt; + } + } } return 0; } @@ -207,4 +207,3 @@ handle_text( if (action != DB_WRITE) print_text(fields, argc, argv); } - diff --git a/db/type.h b/db/type.h index d4092960f..bbeed0315 100644 --- a/db/type.h +++ b/db/type.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/write.c b/db/write.c index 8ad757dbc..37675dc94 100644 --- a/db/write.c +++ b/db/write.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -65,7 +65,7 @@ write_init(void) srand48(clock()); } -static void +static void write_help(void) { dbprintf( @@ -84,7 +84,7 @@ write_help(void) " 'write fname \"hello\\000\"' - write superblock fname.\n" " (note: in struct mode strings are not null terminated)\n" " 'write fname #6669736800' - write superblock fname with hex.\n" -" 'write uuid 00112233-4455-6677-8899-aabbccddeeff'\n" +" 'write uuid 00112233-4455-6677-8899-aabbccddeeff'\n" " - write superblock uuid.\n" " Data mode: 'write fill 0xff' - fill the entire block with 0xff's\n" " 'write lshift 3' - shift the block 3 bytes to the left\n" @@ -477,7 +477,7 @@ convert_arg( rbuf = buf; if (*arg == '\"') { - /* handle strings */ + /* handle strings */ /* zap closing quote if there is one */ if ((ostr = strrchr(arg+1, '\"')) != NULL) @@ -501,45 +501,45 @@ convert_arg( } return buf; - } else if (arg[0] == '#' || ((arg[0] != '-') && strchr(arg,'-'))) { - /* - * handle hex blocks ie - * #00112233445566778899aabbccddeeff - * and uuids ie - * 1122334455667788-99aa-bbcc-ddee-ff00112233445566778899 + } else if (arg[0] == '#' || ((arg[0] != '-') && strchr(arg,'-'))) { + /* + * handle hex blocks ie + * #00112233445566778899aabbccddeeff + * and uuids ie + * 1122334455667788-99aa-bbcc-ddee-ff00112233445566778899 * * (but if it starts with "-" assume it's just an integer) - */ - int bytes=bit_length/8; - - /* skip leading hash */ - if (*arg=='#') arg++; - - while (*arg && bytes--) { - /* skip hypens */ - while (*arg=='-') arg++; - - /* get first nybble */ - if (!isxdigit((int)*arg)) return NULL; - *rbuf=NYBBLE((int)*arg)<<4; - arg++; - - /* skip more hyphens */ - while (*arg=='-') arg++; - - /* get second nybble */ - if (!isxdigit((int)*arg)) return NULL; - *rbuf++|=NYBBLE((int)*arg); - arg++; - } - if (bytes<0&&*arg) return NULL; - return buf; + */ + int bytes=bit_length/8; + + /* skip leading hash */ + if (*arg=='#') arg++; + + while (*arg && bytes--) { + /* skip hypens */ + while (*arg=='-') arg++; + + /* get first nybble */ + if (!isxdigit((int)*arg)) return NULL; + *rbuf=NYBBLE((int)*arg)<<4; + arg++; + + /* skip more hyphens */ + while (*arg=='-') arg++; + + /* get second nybble */ + if (!isxdigit((int)*arg)) return NULL; + *rbuf++|=NYBBLE((int)*arg); + arg++; + } + if (bytes<0&&*arg) return NULL; + return buf; } else { - /* - * handle integers - */ + /* + * handle integers + */ *value = strtoll(arg, NULL, 0); - + #if __BYTE_ORDER == BIG_ENDIAN /* hackery for big endian */ if (bit_length <= 8) { @@ -606,18 +606,18 @@ write_struct( /* convert this to a generic conversion routine */ /* should be able to handle str, num, or even labels */ - + buf = convert_arg(argv[1], bit_length); if (!buf) { dbprintf("unable to convert value '%s'.\n", argv[1]); return; } - setbitval(iocur_top->data, sfl->offset, bit_length, buf); + setbitval(iocur_top->data, sfl->offset, bit_length, buf); write_cur(); flist_print(fl); - print_flist(fl); + print_flist(fl); flist_free(fl); } @@ -655,7 +655,7 @@ write_block( char **argv) { int i; - int shiftcount = -1; + int shiftcount = -1; int start = -1; int len = -1; int from = -1; @@ -683,7 +683,7 @@ write_block( cmd->cmdstr); goto block_usage; } - + if (cmd->shiftcount_arg && (cmd->shiftcount_arg < argc)) shiftcount = (int)strtoul(argv[cmd->shiftcount_arg], NULL, 0); if (cmd->start_arg && (cmd->start_arg < argc)) diff --git a/db/write.h b/db/write.h index 87349ef5d..715d3cce7 100644 --- a/db/write.h +++ b/db/write.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/db/xfs_admin.sh b/db/xfs_admin.sh index 0539768c9..b4e0206db 100755 --- a/db/xfs_admin.sh +++ b/db/xfs_admin.sh @@ -1,33 +1,33 @@ #!/bin/sh -f # # Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # diff --git a/db/xfs_check.sh b/db/xfs_check.sh index f2d60c23a..0d80ab93d 100755 --- a/db/xfs_check.sh +++ b/db/xfs_check.sh @@ -1,36 +1,36 @@ #!/bin/sh -f # # Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # -#ident "$Revision: 1.6 $" +#ident "$Revision: 1.7 $" OPTS=" " ISFILE=" " diff --git a/db/xfs_check64.sh b/db/xfs_check64.sh index fa3dc75e9..7b32e2327 100755 --- a/db/xfs_check64.sh +++ b/db/xfs_check64.sh @@ -1,36 +1,36 @@ #!/bin/sh -f # # Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # -#ident "$Revision: 1.6 $" +#ident "$Revision: 1.7 $" OPTS=" " ISFILE=" " diff --git a/db/xfs_ncheck.sh b/db/xfs_ncheck.sh index 42f53275d..b326c4f95 100755 --- a/db/xfs_ncheck.sh +++ b/db/xfs_ncheck.sh @@ -1,36 +1,36 @@ #!/bin/sh -f # # Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # -#ident "$Revision: 1.6 $" +#ident "$Revision: 1.7 $" OPTS=" " ISFILE=" " diff --git a/db/xfs_ncheck64.sh b/db/xfs_ncheck64.sh index 8107b0892..8372f71e7 100755 --- a/db/xfs_ncheck64.sh +++ b/db/xfs_ncheck64.sh @@ -1,36 +1,36 @@ #!/bin/sh -f # # Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # -#ident "$Revision: 1.6 $" +#ident "$Revision: 1.7 $" OPTS=" " ISFILE=" " diff --git a/freeze/Makefile b/freeze/Makefile index 5ecc4e692..46291d121 100644 --- a/freeze/Makefile +++ b/freeze/Makefile @@ -1,32 +1,32 @@ # # Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # diff --git a/freeze/xfs_freeze.c b/freeze/xfs_freeze.c index 5e7d079c3..a4403b341 100644 --- a/freeze/xfs_freeze.c +++ b/freeze/xfs_freeze.c @@ -40,8 +40,8 @@ usage(void) fprintf(stderr, _( "Usage: %s [options] mountpoint\n\n\ Options:\n\ - -f freeze filesystem access\n\ - -u unfreeze filesystem access\n"), + -f freeze filesystem access\n\ + -u unfreeze filesystem access\n"), progname); exit(2); } @@ -85,7 +85,7 @@ main(int argc, char **argv) perror(fname); return 1; } - + if (!platform_test_xfs_fd(ffd)) { fprintf(stderr, _("%s: specified file " "[\"%s\"] is not on an XFS filesystem\n"), diff --git a/fsck/Makefile b/fsck/Makefile index 2baed506d..c49fa3386 100644 --- a/fsck/Makefile +++ b/fsck/Makefile @@ -1,32 +1,32 @@ # # Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # diff --git a/fsck/xfs_fsck.c b/fsck/xfs_fsck.c index f018d8fb5..9a796b745 100644 --- a/fsck/xfs_fsck.c +++ b/fsck/xfs_fsck.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/growfs/Makefile b/growfs/Makefile index 9d09a39e8..a6c87e1af 100644 --- a/growfs/Makefile +++ b/growfs/Makefile @@ -1,32 +1,32 @@ # # Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c index c604819e2..c579e8111 100644 --- a/growfs/xfs_growfs.c +++ b/growfs/xfs_growfs.c @@ -52,20 +52,20 @@ usage(void) fprintf(stderr, _( "Usage: %s [options] mountpoint\n\n\ Options:\n\ - -d grow data/metadata section\n\ - -l grow log section\n\ - -r grow realtime section\n\ - -n don't change anything, just show geometry\n\ - -I allow inode numbers to exceed %d significant bits\n\ - -i convert log from external to internal format\n\ - -t alternate location for mount table (/etc/mtab)\n\ - -x convert log from internal to external format\n\ - -D size grow data/metadata section to size blks\n\ - -L size grow/shrink log section to size blks\n\ - -R size grow realtime section to size blks\n\ - -e size set realtime extent size to size blks\n\ - -m imaxpct set inode max percent to imaxpct\n\ - -V print version information\n"), + -d grow data/metadata section\n\ + -l grow log section\n\ + -r grow realtime section\n\ + -n don't change anything, just show geometry\n\ + -I allow inode numbers to exceed %d significant bits\n\ + -i convert log from external to internal format\n\ + -t alternate location for mount table (/etc/mtab)\n\ + -x convert log from internal to external format\n\ + -D size grow data/metadata section to size blks\n\ + -L size grow/shrink log section to size blks\n\ + -R size grow realtime section to size blks\n\ + -e size set realtime extent size to size blks\n\ + -m imaxpct set inode max percent to imaxpct\n\ + -V print version information\n"), progname, XFS_MAX_INODE_SIG_BITS); exit(2); } @@ -240,7 +240,7 @@ main(int argc, char **argv) logversion = geo.flags & XFS_FSOP_GEOM_FLAGS_LOGV2 ? 2 : 1; if (nflag) { - report_info(geo, fname, unwritten, dirversion, logversion, + report_info(geo, fname, unwritten, dirversion, logversion, isint); exit(0); } @@ -290,7 +290,7 @@ main(int argc, char **argv) * so if we have (size % 2), on any partition, we can't get * to the last 512 bytes. Just chop it down by a block. */ - + ddsize -= (ddsize % 2); dlsize -= (dlsize % 2); drsize -= (drsize % 2); @@ -312,7 +312,7 @@ main(int argc, char **argv) error = 1; } - new_agcount = dsize / geo.agblocks + new_agcount = dsize / geo.agblocks + (dsize % geo.agblocks != 0); if (!error && dsize < geo.datablocks) { @@ -397,7 +397,7 @@ main(int argc, char **argv) in.isint = 1; else if (xflag) in.isint = 0; - else + else in.isint = xi.logBBsize == 0; if (lsize == geo.logblocks && (in.isint == isint)) { if (lflag) diff --git a/growfs/xfs_info.sh b/growfs/xfs_info.sh index c092ad641..0a3a48854 100755 --- a/growfs/xfs_info.sh +++ b/growfs/xfs_info.sh @@ -1,33 +1,33 @@ #!/bin/sh -f # # Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # diff --git a/imap/Makefile b/imap/Makefile index c2a38fbd4..b00098219 100644 --- a/imap/Makefile +++ b/imap/Makefile @@ -1,32 +1,32 @@ # # Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # diff --git a/imap/xfs_imap.c b/imap/xfs_imap.c index abfa95a42..f23db6c59 100644 --- a/imap/xfs_imap.c +++ b/imap/xfs_imap.c @@ -1,36 +1,36 @@ /* * Copyright (c) 2001-2003 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ -/* +/* * Inode map display utility for XFS. */ diff --git a/include/Makefile b/include/Makefile index 4a650bea8..839475bf5 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,32 +1,32 @@ # # Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # diff --git a/include/builddefs.in b/include/builddefs.in index b939c8c4c..f0c8e95cb 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -1,32 +1,32 @@ # # Copyright (c) 2003 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # # @configure_input@ @@ -110,7 +110,7 @@ endif GCFLAGS += $(OPTIMIZER) $(DEBUG) -funsigned-char -Wall -I$(TOPDIR)/include \ -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\" \ - -DPACKAGE=\"$(PKG_NAME)\" + -DPACKAGE=\"$(PKG_NAME)\" # Global, Platform, Local CFLAGS CFLAGS += $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) diff --git a/include/buildmacros b/include/buildmacros index 54044f41b..f4e8bec8d 100644 --- a/include/buildmacros +++ b/include/buildmacros @@ -1,32 +1,32 @@ # # Copyright (c) 2002-2003 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # @@ -50,9 +50,9 @@ CDIRT = $(OBJECTS) $(LTOBJECTS) $(LTCOMMAND) $(LTLIBRARY) DIRT = $(LDIRT) $(DEPDIRT) $(MANDIRT) $(PODIRT) $(CDIRT) OBJECTS = $(ASFILES:.s=.o) \ - $(CFILES:.c=.o) \ - $(LFILES:.l=.o) \ - $(YFILES:%.y=%.tab.o) + $(CFILES:.c=.o) \ + $(LFILES:.l=.o) \ + $(YFILES:%.y=%.tab.o) INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) @@ -76,7 +76,7 @@ LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF) -D_REENTRANT -fno-strict-aliasing ifeq ($(ENABLE_SHARED),yes) -LTLDFLAGS += -rpath $(PKG_LIB_DIR) +LTLDFLAGS += -rpath $(PKG_LIB_DIR) LTLDFLAGS += -version-info $(LTVERSION) endif diff --git a/include/buildrules b/include/buildrules index 6e186a7bf..89cff027d 100644 --- a/include/buildrules +++ b/include/buildrules @@ -1,10 +1,10 @@ # # Copyright (c) 1999, 2001-2002 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as published # by the Free Software Fondation. -# +# # This program is distributed in the hope that it would be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # FITNESS FOR A PARTICULAR PURPOSE. Further, any license provided herein, @@ -15,7 +15,7 @@ # distributed without any warranty that the program is delivered free of the # rightful claim of any third person by way of infringement or the like. See # the GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along with # this program; if not, write the Free Software Foundation, Inc., 59 Temple # Place - Suite 330, Boston MA 02111-1307, USA. diff --git a/include/dvh.h b/include/dvh.h index 2cf5faea2..4c5a24c5b 100644 --- a/include/dvh.h +++ b/include/dvh.h @@ -39,7 +39,7 @@ * media (sector 0). It contains information pertaining to physical * device parameters and logical partition information. * - * The volume header is manipulated by disk formatters/verifiers, + * The volume header is manipulated by disk formatters/verifiers, * partition builders (e.g. fx, dvhtool, and mkfs), and disk drivers. * * Previous versions of IRIX wrote a copy of the volume header is @@ -166,10 +166,10 @@ struct partition_table { /* one per logical partition */ #define BFNAMESIZE 16 /* max 16 chars in boot file name */ /* Partition types for ARCS */ -#define NOT_USED 0 /* Not used */ -#define FAT_SHORT 1 /* FAT filesystem, 12-bit FAT entries */ -#define FAT_LONG 4 /* FAT filesystem, 16-bit FAT entries */ -#define EXTENDED 5 /* extended partition */ +#define NOT_USED 0 /* Not used */ +#define FAT_SHORT 1 /* FAT filesystem, 12-bit FAT entries */ +#define FAT_LONG 4 /* FAT filesystem, 16-bit FAT entries */ +#define EXTENDED 5 /* extended partition */ #define HUGE 6 /* huge partition- MS/DOS 4.0 and later */ /* Active flags for ARCS */ diff --git a/include/fstyp.h b/include/fstyp.h index d495ea4ba..a4668a06b 100644 --- a/include/fstyp.h +++ b/include/fstyp.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __FSTYP_H__ diff --git a/include/jdm.h b/include/jdm.h index c8b37e62f..cb183c57f 100644 --- a/include/jdm.h +++ b/include/jdm.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __JDM_H__ @@ -47,7 +47,7 @@ jdm_new_filehandle( jdm_filehandle_t **handlep, /* new filehandle */ size_t *hlen, /* new filehandle size */ jdm_fshandle_t *fshandlep, /* filesystem filehandle */ struct xfs_bstat *sp); /* bulkstat info */ - + extern void jdm_delete_filehandle( jdm_filehandle_t *handlep,/* filehandle to delete */ size_t hlen); /* filehandle size */ diff --git a/include/libxfs.h b/include/libxfs.h index 9c379aefe..b900e220d 100644 --- a/include/libxfs.h +++ b/include/libxfs.h @@ -80,31 +80,31 @@ * Argument structure for libxfs_init(). */ typedef struct { - /* input parameters */ - char *volname; /* pathname of volume */ - char *dname; /* pathname of data "subvolume" */ - char *logname; /* pathname of log "subvolume" */ - char *rtname; /* pathname of realtime "subvolume" */ - int isreadonly; /* filesystem is only read in applic */ - int disfile; /* data "subvolume" is a regular file */ int dcreat; /* try to create data subvolume */ - int lisfile; /* log "subvolume" is a regular file */ - int lcreat; /* try to create log subvolume */ - int risfile; /* realtime "subvolume" is a reg file */ int rcreat; /* try to create realtime subvolume */ - char *notvolmsg; /* format string for not XLV message */ - int notvolok; /* set if not XLV => try data */ - /* output results */ - dev_t ddev; /* device for data subvolume */ - dev_t logdev; /* device for log subvolume */ - dev_t rtdev; /* device for realtime subvolume */ - long long dsize; /* size of data subvolume (BBs) */ - long long logBBsize; /* size of log subvolume (BBs) */ - /* (blocks allocated for use as - * log is stored in mount structure) */ - long long logBBstart; /* start block of log subvolume (BBs) */ long long rtsize; /* size of realtime subvolume (BBs) */ - int dfd; /* data subvolume file descriptor */ - int logfd; /* log subvolume file descriptor */ - int rtfd; /* realtime subvolume file descriptor */ - int setblksize; /* attempt to set device block size */ + /* input parameters */ + char *volname; /* pathname of volume */ + char *dname; /* pathname of data "subvolume" */ + char *logname; /* pathname of log "subvolume" */ + char *rtname; /* pathname of realtime "subvolume" */ + int isreadonly; /* filesystem is only read in applic */ + int disfile; /* data "subvolume" is a regular file */ int dcreat; /* try to create data subvolume */ + int lisfile; /* log "subvolume" is a regular file */ + int lcreat; /* try to create log subvolume */ + int risfile; /* realtime "subvolume" is a reg file */ int rcreat; /* try to create realtime subvolume */ + char *notvolmsg; /* format string for not XLV message */ + int notvolok; /* set if not XLV => try data */ + /* output results */ + dev_t ddev; /* device for data subvolume */ + dev_t logdev; /* device for log subvolume */ + dev_t rtdev; /* device for realtime subvolume */ + long long dsize; /* size of data subvolume (BBs) */ + long long logBBsize; /* size of log subvolume (BBs) */ + /* (blocks allocated for use as + * log is stored in mount structure) */ + long long logBBstart; /* start block of log subvolume (BBs) */ long long rtsize; /* size of realtime subvolume (BBs) */ + int dfd; /* data subvolume file descriptor */ + int logfd; /* log subvolume file descriptor */ + int rtfd; /* realtime subvolume file descriptor */ + int setblksize; /* attempt to set device block size */ } libxfs_init_t; #define LIBXFS_EXIT_ON_FAILURE 0x0001 /* exit the program if a call fails */ @@ -122,7 +122,7 @@ extern void libxfs_device_close (dev_t); extern int libxfs_log_clear (dev_t, xfs_daddr_t, uint, uuid_t *, int, int, int); -/* +/* * Define a user-level mount structure with all we need * in order to make use of the numerous XFS_* macros. */ diff --git a/include/libxlog.h b/include/libxlog.h index 153090841..80ecee25f 100644 --- a/include/libxlog.h +++ b/include/libxlog.h @@ -69,7 +69,7 @@ typedef struct log { * macros mapping kernel code to user code */ #ifndef EFSCORRUPTED -#define EFSCORRUPTED 990 +#define EFSCORRUPTED 990 #endif #define STATIC static #define XFS_ERROR(e) (e) @@ -103,7 +103,7 @@ typedef struct log { #define xlog_bread(log,blkno,nbblks,bp) \ (libxfs_readbufr(x.logdev, \ (log)->l_logBBstart+(blkno), bp, (nbblks), 1), 0) - + #define kmem_zalloc(size, foo) calloc(size,1) #define kmem_free(ptr, foo) free(ptr) #define kmem_realloc(ptr, len, old, foo) realloc(ptr, len) @@ -119,7 +119,7 @@ extern void xfs_log_print_trans(xlog_t *log, int print_block_start); extern void xfs_log_print( xlog_t *log, - int fd, + int fd, int print_block_start); extern int xlog_find_zeroed(xlog_t *log, xfs_daddr_t *blk_no); @@ -153,9 +153,9 @@ extern int xlog_do_recovery_pass( xlog_t *log, extern int xlog_recover_do_trans( xlog_t *log, xlog_recover_t *trans, int pass); -extern int xlog_header_check_recover( xfs_mount_t *mp, - xlog_rec_header_t *head); -extern int xlog_header_check_mount( xfs_mount_t *mp, - xlog_rec_header_t *head); +extern int xlog_header_check_recover( xfs_mount_t *mp, + xlog_rec_header_t *head); +extern int xlog_header_check_mount( xfs_mount_t *mp, + xlog_rec_header_t *head); #endif /* LIBXLOG_H */ diff --git a/include/platform_defs.h.in b/include/platform_defs.h.in index 25fa6572b..7a416fccb 100644 --- a/include/platform_defs.h.in +++ b/include/platform_defs.h.in @@ -229,7 +229,7 @@ typedef unsigned char uchar_t; #include "swab.h" #define O_LARGEFILE 0 -#ifndef O_DIRECT +#ifndef O_DIRECT #define O_DIRECT 0 #endif #ifndef O_SYNC @@ -293,7 +293,7 @@ typedef char* xfs_caddr_t; static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p) { - fprintf(stderr, "%s: line %d syssgi/fcntl mapping not implemented\n", + fprintf(stderr, "%s: line %d syssgi/fcntl mapping not implemented\n", __FILE__, __LINE__); errno = ENOSYS; return -1; @@ -314,15 +314,15 @@ static __inline__ int platform_fstatfs(int fd, struct statfs *buf) static __inline__ char * strsep(char **s, const char *ct) { - char *sbegin = *s, *end; - - if (!sbegin) - return NULL; - end = strpbrk(sbegin, ct); - if (end) - *end++ = '\0'; - *s = end; - return sbegin; + char *sbegin = *s, *end; + + if (!sbegin) + return NULL; + end = strpbrk(sbegin, ct); + if (end) + *end++ = '\0'; + *s = end; + return sbegin; } #define HAVE_DIOATTR 1 diff --git a/include/swab.h b/include/swab.h index f3ebd81c3..243c7c9c7 100644 --- a/include/swab.h +++ b/include/swab.h @@ -30,7 +30,7 @@ (__u64)(((__u64)(__x) & (__u64)0x000000000000ff00ULL) << 40) | \ (__u64)(((__u64)(__x) & (__u64)0x0000000000ff0000ULL) << 24) | \ (__u64)(((__u64)(__x) & (__u64)0x00000000ff000000ULL) << 8) | \ - (__u64)(((__u64)(__x) & (__u64)0x000000ff00000000ULL) >> 8) | \ + (__u64)(((__u64)(__x) & (__u64)0x000000ff00000000ULL) >> 8) | \ (__u64)(((__u64)(__x) & (__u64)0x0000ff0000000000ULL) >> 24) | \ (__u64)(((__u64)(__x) & (__u64)0x00ff000000000000ULL) >> 40) | \ (__u64)(((__u64)(__x) & (__u64)0xff00000000000000ULL) >> 56) )); \ @@ -52,7 +52,7 @@ (__u64)(((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) | \ (__u64)(((__u64)(x) & (__u64)0x0000000000ff0000ULL) << 24) | \ (__u64)(((__u64)(x) & (__u64)0x00000000ff000000ULL) << 8) | \ - (__u64)(((__u64)(x) & (__u64)0x000000ff00000000ULL) >> 8) | \ + (__u64)(((__u64)(x) & (__u64)0x000000ff00000000ULL) >> 8) | \ (__u64)(((__u64)(x) & (__u64)0x0000ff0000000000ULL) >> 24) | \ (__u64)(((__u64)(x) & (__u64)0x00ff000000000000ULL) >> 40) | \ (__u64)(((__u64)(x) & (__u64)0xff00000000000000ULL) >> 56) )) @@ -138,8 +138,8 @@ static __inline__ __const__ __u64 __fswab64(__u64 x) { # ifdef __SWAB_64_THRU_32__ __u32 h = x >> 32; - __u32 l = x & ((1ULL<<32)-1); - return (((__u64)__swab32(l)) << 32) | ((__u64)(__swab32(h))); + __u32 l = x & ((1ULL<<32)-1); + return (((__u64)__swab32(l)) << 32) | ((__u64)(__swab32(h))); # else return __arch__swab64(x); # endif diff --git a/include/volume.h b/include/volume.h index ee8bb8c18..e93e0533e 100644 --- a/include/volume.h +++ b/include/volume.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __VOLUME_H__ @@ -34,14 +34,14 @@ /* * Subvolume Types for all volume managers. - * + * * There is a maximum of 255 subvolumes. 0 is reserved. * Note: SVTYPE_LOG, SVTYPE_DATA, SVTYPE_RT values matches XLV. * Do not change - Colin Ngam */ typedef enum sv_type_e { SVTYPE_ALL =0, /* special: denotes all sv's */ - SVTYPE_LOG =1, /* XVM Log subvol type */ + SVTYPE_LOG =1, /* XVM Log subvol type */ SVTYPE_DATA, /* XVM Data subvol type */ SVTYPE_RT, /* XVM Real Time subvol type */ SVTYPE_SWAP, /* swap area */ diff --git a/include/xfs_acl.h b/include/xfs_acl.h index dda3fb5f8..0fbaecec8 100644 --- a/include/xfs_acl.h +++ b/include/xfs_acl.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -51,12 +51,12 @@ typedef struct xfs_acl_entry { typedef struct xfs_acl { __int32_t acl_cnt; - xfs_acl_entry_t acl_entry[XFS_ACL_MAX_ENTRIES]; + xfs_acl_entry_t acl_entry[XFS_ACL_MAX_ENTRIES]; } xfs_acl_t; /* On-disk XFS extended attribute names */ #define SGI_ACL_FILE "SGI_ACL_FILE" -#define SGI_ACL_DEFAULT "SGI_ACL_DEFAULT" +#define SGI_ACL_DEFAULT "SGI_ACL_DEFAULT" #define SGI_ACL_FILE_SIZE (sizeof(SGI_ACL_FILE)-1) #define SGI_ACL_DEFAULT_SIZE (sizeof(SGI_ACL_DEFAULT)-1) @@ -84,7 +84,7 @@ extern struct kmem_zone *xfs_acl_zone; #define _ACL_TYPE_ACCESS 1 #define _ACL_TYPE_DEFAULT 2 -#define _ACL_PERM_INVALID(perm) ((perm) & ~(ACL_READ|ACL_WRITE|ACL_EXECUTE)) +#define _ACL_PERM_INVALID(perm) ((perm) & ~(ACL_READ|ACL_WRITE|ACL_EXECUTE)) #define _ACL_DECL(a) xfs_acl_t *(a) = NULL #define _ACL_ALLOC(a) ((a) = kmem_zone_alloc(xfs_acl_zone, KM_SLEEP)) @@ -93,7 +93,7 @@ extern struct kmem_zone *xfs_acl_zone; #define _ACL_ZONE_DESTROY(z) (kmem_cache_destroy(z)) #define _ACL_INHERIT(c,v,d) (xfs_acl_inherit(c,v,d)) #define _ACL_GET_ACCESS(pv,pa) (xfs_acl_vtoacl(pv,pa,NULL) == 0) -#define _ACL_GET_DEFAULT(pv,pd) (xfs_acl_vtoacl(pv,NULL,pd) == 0) +#define _ACL_GET_DEFAULT(pv,pd) (xfs_acl_vtoacl(pv,NULL,pd) == 0) #define _ACL_ACCESS_EXISTS xfs_acl_vhasacl_access #define _ACL_DEFAULT_EXISTS xfs_acl_vhasacl_default #define _ACL_XFS_IACCESS(i,m,c) (XFS_IFORK_Q(i) ? xfs_acl_iaccess(i,m,c) : -1) @@ -109,7 +109,7 @@ extern struct kmem_zone *xfs_acl_zone; #define _ACL_ZONE_DESTROY(z) ((void)0) #define _ACL_INHERIT(c,v,d) (0) #define _ACL_GET_ACCESS(pv,pa) (0) -#define _ACL_GET_DEFAULT(pv,pd) (0) +#define _ACL_GET_DEFAULT(pv,pd) (0) #define _ACL_ACCESS_EXISTS (NULL) #define _ACL_DEFAULT_EXISTS (NULL) #define _ACL_XFS_IACCESS(i,m,c) (-1) diff --git a/include/xfs_ag.h b/include/xfs_ag.h index 9959c923d..4820ad2ea 100644 --- a/include/xfs_ag.h +++ b/include/xfs_ag.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_AG_H__ -#define __XFS_AG_H__ +#define __XFS_AG_H__ /* * Allocation group header @@ -42,19 +42,19 @@ struct xfs_buf; struct xfs_mount; struct xfs_trans; -#define XFS_AGF_MAGIC 0x58414746 /* 'XAGF' */ -#define XFS_AGI_MAGIC 0x58414749 /* 'XAGI' */ -#define XFS_AGF_VERSION 1 -#define XFS_AGI_VERSION 1 +#define XFS_AGF_MAGIC 0x58414746 /* 'XAGF' */ +#define XFS_AGI_MAGIC 0x58414749 /* 'XAGI' */ +#define XFS_AGF_VERSION 1 +#define XFS_AGI_VERSION 1 #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AGF_GOOD_VERSION) int xfs_agf_good_version(unsigned v); -#define XFS_AGF_GOOD_VERSION(v) xfs_agf_good_version(v) +#define XFS_AGF_GOOD_VERSION(v) xfs_agf_good_version(v) #else #define XFS_AGF_GOOD_VERSION(v) ((v) == XFS_AGF_VERSION) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AGI_GOOD_VERSION) int xfs_agi_good_version(unsigned v); -#define XFS_AGI_GOOD_VERSION(v) xfs_agi_good_version(v) +#define XFS_AGI_GOOD_VERSION(v) xfs_agi_good_version(v) #else #define XFS_AGI_GOOD_VERSION(v) ((v) == XFS_AGI_VERSION) #endif @@ -63,7 +63,7 @@ int xfs_agi_good_version(unsigned v); * Btree number 0 is bno, 1 is cnt. This value gives the size of the * arrays below. */ -#define XFS_BTNUM_AGF ((int)XFS_BTNUM_CNTi + 1) +#define XFS_BTNUM_AGF ((int)XFS_BTNUM_CNTi + 1) /* * The second word of agf_levels in the first a.g. overlaps the EFS @@ -77,7 +77,7 @@ typedef struct xfs_agf * Common allocation group header information */ __uint32_t agf_magicnum; /* magic number == XFS_AGF_MAGIC */ - __uint32_t agf_versionnum; /* header version == XFS_AGF_VERSION */ + __uint32_t agf_versionnum; /* header version == XFS_AGF_VERSION */ xfs_agnumber_t agf_seqno; /* sequence # starting from 0 */ xfs_agblock_t agf_length; /* size in blocks of a.g. */ /* @@ -94,25 +94,25 @@ typedef struct xfs_agf xfs_extlen_t agf_longest; /* longest free space */ } xfs_agf_t; -#define XFS_AGF_MAGICNUM 0x00000001 -#define XFS_AGF_VERSIONNUM 0x00000002 -#define XFS_AGF_SEQNO 0x00000004 -#define XFS_AGF_LENGTH 0x00000008 -#define XFS_AGF_ROOTS 0x00000010 -#define XFS_AGF_LEVELS 0x00000020 -#define XFS_AGF_FLFIRST 0x00000040 -#define XFS_AGF_FLLAST 0x00000080 -#define XFS_AGF_FLCOUNT 0x00000100 -#define XFS_AGF_FREEBLKS 0x00000200 -#define XFS_AGF_LONGEST 0x00000400 -#define XFS_AGF_NUM_BITS 11 -#define XFS_AGF_ALL_BITS ((1 << XFS_AGF_NUM_BITS) - 1) +#define XFS_AGF_MAGICNUM 0x00000001 +#define XFS_AGF_VERSIONNUM 0x00000002 +#define XFS_AGF_SEQNO 0x00000004 +#define XFS_AGF_LENGTH 0x00000008 +#define XFS_AGF_ROOTS 0x00000010 +#define XFS_AGF_LEVELS 0x00000020 +#define XFS_AGF_FLFIRST 0x00000040 +#define XFS_AGF_FLLAST 0x00000080 +#define XFS_AGF_FLCOUNT 0x00000100 +#define XFS_AGF_FREEBLKS 0x00000200 +#define XFS_AGF_LONGEST 0x00000400 +#define XFS_AGF_NUM_BITS 11 +#define XFS_AGF_ALL_BITS ((1 << XFS_AGF_NUM_BITS) - 1) /* disk block (xfs_daddr_t) in the AG */ #define XFS_AGF_DADDR(mp) ((xfs_daddr_t)(1 << (mp)->m_sectbb_log)) #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AGF_BLOCK) xfs_agblock_t xfs_agf_block(struct xfs_mount *mp); -#define XFS_AGF_BLOCK(mp) xfs_agf_block(mp) +#define XFS_AGF_BLOCK(mp) xfs_agf_block(mp) #else #define XFS_AGF_BLOCK(mp) XFS_HDR_BLOCK(mp, XFS_AGF_DADDR(mp)) #endif @@ -120,7 +120,7 @@ xfs_agblock_t xfs_agf_block(struct xfs_mount *mp); /* * Size of the unlinked inode hash table in the agi. */ -#define XFS_AGI_UNLINKED_BUCKETS 64 +#define XFS_AGI_UNLINKED_BUCKETS 64 typedef struct xfs_agi { @@ -128,7 +128,7 @@ typedef struct xfs_agi * Common allocation group header information */ __uint32_t agi_magicnum; /* magic number == XFS_AGI_MAGIC */ - __uint32_t agi_versionnum; /* header version == XFS_AGI_VERSION */ + __uint32_t agi_versionnum; /* header version == XFS_AGI_VERSION */ xfs_agnumber_t agi_seqno; /* sequence # starting from 0 */ xfs_agblock_t agi_length; /* size in blocks of a.g. */ /* @@ -149,25 +149,25 @@ typedef struct xfs_agi xfs_agino_t agi_unlinked[XFS_AGI_UNLINKED_BUCKETS]; } xfs_agi_t; -#define XFS_AGI_MAGICNUM 0x00000001 -#define XFS_AGI_VERSIONNUM 0x00000002 -#define XFS_AGI_SEQNO 0x00000004 -#define XFS_AGI_LENGTH 0x00000008 -#define XFS_AGI_COUNT 0x00000010 -#define XFS_AGI_ROOT 0x00000020 -#define XFS_AGI_LEVEL 0x00000040 -#define XFS_AGI_FREECOUNT 0x00000080 -#define XFS_AGI_NEWINO 0x00000100 -#define XFS_AGI_DIRINO 0x00000200 -#define XFS_AGI_UNLINKED 0x00000400 -#define XFS_AGI_NUM_BITS 11 -#define XFS_AGI_ALL_BITS ((1 << XFS_AGI_NUM_BITS) - 1) +#define XFS_AGI_MAGICNUM 0x00000001 +#define XFS_AGI_VERSIONNUM 0x00000002 +#define XFS_AGI_SEQNO 0x00000004 +#define XFS_AGI_LENGTH 0x00000008 +#define XFS_AGI_COUNT 0x00000010 +#define XFS_AGI_ROOT 0x00000020 +#define XFS_AGI_LEVEL 0x00000040 +#define XFS_AGI_FREECOUNT 0x00000080 +#define XFS_AGI_NEWINO 0x00000100 +#define XFS_AGI_DIRINO 0x00000200 +#define XFS_AGI_UNLINKED 0x00000400 +#define XFS_AGI_NUM_BITS 11 +#define XFS_AGI_ALL_BITS ((1 << XFS_AGI_NUM_BITS) - 1) /* disk block (xfs_daddr_t) in the AG */ #define XFS_AGI_DADDR(mp) ((xfs_daddr_t)(2 << (mp)->m_sectbb_log)) #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AGI_BLOCK) xfs_agblock_t xfs_agi_block(struct xfs_mount *mp); -#define XFS_AGI_BLOCK(mp) xfs_agi_block(mp) +#define XFS_AGI_BLOCK(mp) xfs_agi_block(mp) #else #define XFS_AGI_BLOCK(mp) XFS_HDR_BLOCK(mp, XFS_AGI_DADDR(mp)) #endif @@ -179,7 +179,7 @@ xfs_agblock_t xfs_agi_block(struct xfs_mount *mp); #define XFS_AGFL_DADDR(mp) ((xfs_daddr_t)(3 << (mp)->m_sectbb_log)) #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AGFL_BLOCK) xfs_agblock_t xfs_agfl_block(struct xfs_mount *mp); -#define XFS_AGFL_BLOCK(mp) xfs_agfl_block(mp) +#define XFS_AGFL_BLOCK(mp) xfs_agfl_block(mp) #else #define XFS_AGFL_BLOCK(mp) XFS_HDR_BLOCK(mp, XFS_AGFL_DADDR(mp)) #endif @@ -223,7 +223,7 @@ typedef struct xfs_perag __uint32_t pagf_flcount; /* count of blocks in freelist */ xfs_extlen_t pagf_freeblks; /* total free blocks */ xfs_extlen_t pagf_longest; /* longest free space */ - xfs_agino_t pagi_freecount; /* number of free inodes */ + xfs_agino_t pagi_freecount; /* number of free inodes */ #ifdef __KERNEL__ lock_t pagb_lock; /* lock for pagb_list */ #endif @@ -231,19 +231,19 @@ typedef struct xfs_perag xfs_perag_busy_t *pagb_list; /* unstable blocks */ } xfs_perag_t; -#define XFS_AG_MIN_BYTES (1LL << 24) /* 16 MB */ -#define XFS_AG_BEST_BYTES (1LL << 30) /* 1 GB */ -#define XFS_AG_MAX_BYTES (1LL << 32) /* 4 GB */ +#define XFS_AG_MIN_BYTES (1LL << 24) /* 16 MB */ +#define XFS_AG_BEST_BYTES (1LL << 30) /* 1 GB */ +#define XFS_AG_MAX_BYTES (1LL << 32) /* 4 GB */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AG_MIN_BLOCKS) xfs_extlen_t xfs_ag_min_blocks(int bl); -#define XFS_AG_MIN_BLOCKS(bl) xfs_ag_min_blocks(bl) +#define XFS_AG_MIN_BLOCKS(bl) xfs_ag_min_blocks(bl) #else -#define XFS_AG_MIN_BLOCKS(bl) ((xfs_extlen_t)(XFS_AG_MIN_BYTES >> bl)) +#define XFS_AG_MIN_BLOCKS(bl) ((xfs_extlen_t)(XFS_AG_MIN_BYTES >> bl)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AG_BEST_BLOCKS) xfs_extlen_t xfs_ag_best_blocks(int bl, xfs_drfsbno_t blks); -#define XFS_AG_BEST_BLOCKS(bl,blks) xfs_ag_best_blocks(bl,blks) +#define XFS_AG_BEST_BLOCKS(bl,blks) xfs_ag_best_blocks(bl,blks) #else /*--#define XFS_AG_BEST_BLOCKS(bl) ((xfs_extlen_t)(XFS_AG_BEST_BYTES >> bl))*/ /* @@ -257,41 +257,41 @@ xfs_extlen_t xfs_ag_best_blocks(int bl, xfs_drfsbno_t blks); #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AG_MAX_BLOCKS) xfs_extlen_t xfs_ag_max_blocks(int bl); -#define XFS_AG_MAX_BLOCKS(bl) xfs_ag_max_blocks(bl) +#define XFS_AG_MAX_BLOCKS(bl) xfs_ag_max_blocks(bl) #else -#define XFS_AG_MAX_BLOCKS(bl) ((xfs_extlen_t)(XFS_AG_MAX_BYTES >> bl)) +#define XFS_AG_MAX_BLOCKS(bl) ((xfs_extlen_t)(XFS_AG_MAX_BYTES >> bl)) #endif -#define XFS_MAX_AGNUMBER ((xfs_agnumber_t)(NULLAGNUMBER - 1)) +#define XFS_MAX_AGNUMBER ((xfs_agnumber_t)(NULLAGNUMBER - 1)) #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AG_MAXLEVELS) int xfs_ag_maxlevels(struct xfs_mount *mp); -#define XFS_AG_MAXLEVELS(mp) xfs_ag_maxlevels(mp) +#define XFS_AG_MAXLEVELS(mp) xfs_ag_maxlevels(mp) #else -#define XFS_AG_MAXLEVELS(mp) ((mp)->m_ag_maxlevels) +#define XFS_AG_MAXLEVELS(mp) ((mp)->m_ag_maxlevels) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_MIN_FREELIST) int xfs_min_freelist(xfs_agf_t *a, struct xfs_mount *mp); -#define XFS_MIN_FREELIST(a,mp) xfs_min_freelist(a,mp) +#define XFS_MIN_FREELIST(a,mp) xfs_min_freelist(a,mp) #else -#define XFS_MIN_FREELIST(a,mp) \ +#define XFS_MIN_FREELIST(a,mp) \ XFS_MIN_FREELIST_RAW( \ INT_GET((a)->agf_levels[XFS_BTNUM_BNOi], ARCH_CONVERT), \ INT_GET((a)->agf_levels[XFS_BTNUM_CNTi], ARCH_CONVERT), mp) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_MIN_FREELIST_PAG) int xfs_min_freelist_pag(xfs_perag_t *pag, struct xfs_mount *mp); -#define XFS_MIN_FREELIST_PAG(pag,mp) xfs_min_freelist_pag(pag,mp) +#define XFS_MIN_FREELIST_PAG(pag,mp) xfs_min_freelist_pag(pag,mp) #else -#define XFS_MIN_FREELIST_PAG(pag,mp) \ +#define XFS_MIN_FREELIST_PAG(pag,mp) \ XFS_MIN_FREELIST_RAW((uint_t)(pag)->pagf_levels[XFS_BTNUM_BNOi], \ (uint_t)(pag)->pagf_levels[XFS_BTNUM_CNTi], mp) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_MIN_FREELIST_RAW) int xfs_min_freelist_raw(int bl, int cl, struct xfs_mount *mp); -#define XFS_MIN_FREELIST_RAW(bl,cl,mp) xfs_min_freelist_raw(bl,cl,mp) +#define XFS_MIN_FREELIST_RAW(bl,cl,mp) xfs_min_freelist_raw(bl,cl,mp) #else -#define XFS_MIN_FREELIST_RAW(bl,cl,mp) \ +#define XFS_MIN_FREELIST_RAW(bl,cl,mp) \ (MIN(bl + 1, XFS_AG_MAXLEVELS(mp)) + \ MIN(cl + 1, XFS_AG_MAXLEVELS(mp))) #endif @@ -301,30 +301,30 @@ xfs_fsblock_t xfs_agb_to_fsb(struct xfs_mount *mp, xfs_agnumber_t agno, xfs_agblock_t agbno); #define XFS_AGB_TO_FSB(mp,agno,agbno) xfs_agb_to_fsb(mp,agno,agbno) #else -#define XFS_AGB_TO_FSB(mp,agno,agbno) \ +#define XFS_AGB_TO_FSB(mp,agno,agbno) \ (((xfs_fsblock_t)(agno) << (mp)->m_sb.sb_agblklog) | (agbno)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_FSB_TO_AGNO) xfs_agnumber_t xfs_fsb_to_agno(struct xfs_mount *mp, xfs_fsblock_t fsbno); -#define XFS_FSB_TO_AGNO(mp,fsbno) xfs_fsb_to_agno(mp,fsbno) +#define XFS_FSB_TO_AGNO(mp,fsbno) xfs_fsb_to_agno(mp,fsbno) #else -#define XFS_FSB_TO_AGNO(mp,fsbno) \ +#define XFS_FSB_TO_AGNO(mp,fsbno) \ ((xfs_agnumber_t)((fsbno) >> (mp)->m_sb.sb_agblklog)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_FSB_TO_AGBNO) xfs_agblock_t xfs_fsb_to_agbno(struct xfs_mount *mp, xfs_fsblock_t fsbno); -#define XFS_FSB_TO_AGBNO(mp,fsbno) xfs_fsb_to_agbno(mp,fsbno) +#define XFS_FSB_TO_AGBNO(mp,fsbno) xfs_fsb_to_agbno(mp,fsbno) #else -#define XFS_FSB_TO_AGBNO(mp,fsbno) \ +#define XFS_FSB_TO_AGBNO(mp,fsbno) \ ((xfs_agblock_t)((fsbno) & XFS_MASK32LO((mp)->m_sb.sb_agblklog))) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AGB_TO_DADDR) xfs_daddr_t xfs_agb_to_daddr(struct xfs_mount *mp, xfs_agnumber_t agno, xfs_agblock_t agbno); -#define XFS_AGB_TO_DADDR(mp,agno,agbno) xfs_agb_to_daddr(mp,agno,agbno) +#define XFS_AGB_TO_DADDR(mp,agno,agbno) xfs_agb_to_daddr(mp,agno,agbno) #else -#define XFS_AGB_TO_DADDR(mp,agno,agbno) \ +#define XFS_AGB_TO_DADDR(mp,agno,agbno) \ ((xfs_daddr_t)(XFS_FSB_TO_BB(mp, \ (xfs_fsblock_t)(agno) * (mp)->m_sb.sb_agblocks + (agbno)))) #endif @@ -336,28 +336,28 @@ xfs_daddr_t xfs_agb_to_daddr(struct xfs_mount *mp, xfs_agnumber_t agno, #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AG_DADDR) xfs_daddr_t xfs_ag_daddr(struct xfs_mount *mp, xfs_agnumber_t agno, xfs_daddr_t d); -#define XFS_AG_DADDR(mp,agno,d) xfs_ag_daddr(mp,agno,d) +#define XFS_AG_DADDR(mp,agno,d) xfs_ag_daddr(mp,agno,d) #else -#define XFS_AG_DADDR(mp,agno,d) (XFS_AGB_TO_DADDR(mp, agno, 0) + (d)) +#define XFS_AG_DADDR(mp,agno,d) (XFS_AGB_TO_DADDR(mp, agno, 0) + (d)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_BUF_TO_AGF) xfs_agf_t *xfs_buf_to_agf(struct xfs_buf *bp); -#define XFS_BUF_TO_AGF(bp) xfs_buf_to_agf(bp) +#define XFS_BUF_TO_AGF(bp) xfs_buf_to_agf(bp) #else -#define XFS_BUF_TO_AGF(bp) ((xfs_agf_t *)XFS_BUF_PTR(bp)) +#define XFS_BUF_TO_AGF(bp) ((xfs_agf_t *)XFS_BUF_PTR(bp)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_BUF_TO_AGI) xfs_agi_t *xfs_buf_to_agi(struct xfs_buf *bp); -#define XFS_BUF_TO_AGI(bp) xfs_buf_to_agi(bp) +#define XFS_BUF_TO_AGI(bp) xfs_buf_to_agi(bp) #else -#define XFS_BUF_TO_AGI(bp) ((xfs_agi_t *)XFS_BUF_PTR(bp)) +#define XFS_BUF_TO_AGI(bp) ((xfs_agi_t *)XFS_BUF_PTR(bp)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_BUF_TO_AGFL) xfs_agfl_t *xfs_buf_to_agfl(struct xfs_buf *bp); -#define XFS_BUF_TO_AGFL(bp) xfs_buf_to_agfl(bp) +#define XFS_BUF_TO_AGFL(bp) xfs_buf_to_agfl(bp) #else -#define XFS_BUF_TO_AGFL(bp) ((xfs_agfl_t *)XFS_BUF_PTR(bp)) +#define XFS_BUF_TO_AGFL(bp) ((xfs_agfl_t *)XFS_BUF_PTR(bp)) #endif /* @@ -366,9 +366,9 @@ xfs_agfl_t *xfs_buf_to_agfl(struct xfs_buf *bp); */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AG_CHECK_DADDR) void xfs_ag_check_daddr(struct xfs_mount *mp, xfs_daddr_t d, xfs_extlen_t len); -#define XFS_AG_CHECK_DADDR(mp,d,len) xfs_ag_check_daddr(mp,d,len) +#define XFS_AG_CHECK_DADDR(mp,d,len) xfs_ag_check_daddr(mp,d,len) #else -#define XFS_AG_CHECK_DADDR(mp,d,len) \ +#define XFS_AG_CHECK_DADDR(mp,d,len) \ ((len) == 1 ? \ ASSERT((d) == XFS_SB_DADDR || \ XFS_DADDR_TO_AGBNO(mp, d) != XFS_SB_DADDR) : \ diff --git a/include/xfs_alloc.h b/include/xfs_alloc.h index 8ab7ca03a..49ce9aed6 100644 --- a/include/xfs_alloc.h +++ b/include/xfs_alloc.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_ALLOC_H__ -#define __XFS_ALLOC_H__ +#define __XFS_ALLOC_H__ struct xfs_buf; struct xfs_mount; @@ -38,7 +38,7 @@ struct xfs_perag; struct xfs_trans; /* - * Freespace allocation types. Argument to xfs_alloc_[v]extent. + * Freespace allocation types. Argument to xfs_alloc_[v]extent. */ typedef enum xfs_alloctype { @@ -54,7 +54,7 @@ typedef enum xfs_alloctype /* * Flags for xfs_alloc_fix_freelist. */ -#define XFS_ALLOC_FLAG_TRYLOCK 0x00000001 /* use trylock for buffer locking */ +#define XFS_ALLOC_FLAG_TRYLOCK 0x00000001 /* use trylock for buffer locking */ /* * Argument structure for xfs_alloc routines. @@ -78,8 +78,8 @@ typedef struct xfs_alloc_arg { xfs_extlen_t alignment; /* align answer to multiple of this */ xfs_extlen_t minalignslop; /* slop for minlen+alignment calcs */ xfs_extlen_t len; /* output: actual size of extent */ - xfs_alloctype_t type; /* allocation type XFS_ALLOCTYPE_... */ - xfs_alloctype_t otype; /* original allocation type */ + xfs_alloctype_t type; /* allocation type XFS_ALLOCTYPE_... */ + xfs_alloctype_t otype; /* original allocation type */ char wasdel; /* set if allocation was prev delayed */ char wasfromfl; /* set if allocation is from freelist */ char isfl; /* set if is freelist blocks - !actg */ @@ -98,21 +98,21 @@ typedef struct xfs_alloc_arg { /* * Types for alloc tracing. */ -#define XFS_ALLOC_KTRACE_ALLOC 1 -#define XFS_ALLOC_KTRACE_FREE 2 -#define XFS_ALLOC_KTRACE_MODAGF 3 -#define XFS_ALLOC_KTRACE_BUSY 4 -#define XFS_ALLOC_KTRACE_UNBUSY 5 -#define XFS_ALLOC_KTRACE_BUSYSEARCH 6 +#define XFS_ALLOC_KTRACE_ALLOC 1 +#define XFS_ALLOC_KTRACE_FREE 2 +#define XFS_ALLOC_KTRACE_MODAGF 3 +#define XFS_ALLOC_KTRACE_BUSY 4 +#define XFS_ALLOC_KTRACE_UNBUSY 5 +#define XFS_ALLOC_KTRACE_BUSYSEARCH 6 /* * Allocation tracing buffer size. */ -#define XFS_ALLOC_TRACE_SIZE 4096 +#define XFS_ALLOC_TRACE_SIZE 4096 #ifdef XFS_ALL_TRACE -#define XFS_ALLOC_TRACE +#define XFS_ALLOC_TRACE #endif #if !defined(DEBUG) @@ -138,7 +138,7 @@ int /* error */ xfs_alloc_get_freelist( struct xfs_trans *tp, /* transaction pointer */ struct xfs_buf *agbp, /* buffer containing the agf structure */ - xfs_agblock_t *bnop); /* block address retrieved from freelist */ + xfs_agblock_t *bnop); /* block address retrieved from freelist */ /* * Log the given fields from the agf structure. @@ -157,7 +157,7 @@ xfs_alloc_pagf_init( struct xfs_mount *mp, /* file system mount structure */ struct xfs_trans *tp, /* transaction pointer */ xfs_agnumber_t agno, /* allocation group number */ - int flags); /* XFS_ALLOC_FLAGS_... */ + int flags); /* XFS_ALLOC_FLAGS_... */ /* * Put the block on the freelist for the allocation group. @@ -185,7 +185,7 @@ xfs_alloc_read_agf( */ int /* error */ xfs_alloc_vextent( - xfs_alloc_arg_t *args); /* allocation argument structure */ + xfs_alloc_arg_t *args); /* allocation argument structure */ /* * Free an extent. diff --git a/include/xfs_alloc_btree.h b/include/xfs_alloc_btree.h index e788103ba..ed5161a57 100644 --- a/include/xfs_alloc_btree.h +++ b/include/xfs_alloc_btree.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_ALLOC_BTREE_H__ -#define __XFS_ALLOC_BTREE_H__ +#define __XFS_ALLOC_BTREE_H__ /* * Freespace on-disk structures @@ -46,8 +46,8 @@ struct xfs_mount; * by blockcount and blockno. All blocks look the same to make the code * simpler; if we have time later, we'll make the optimizations. */ -#define XFS_ABTB_MAGIC 0x41425442 /* 'ABTB' for bno tree */ -#define XFS_ABTC_MAGIC 0x41425443 /* 'ABTC' for cnt tree */ +#define XFS_ABTB_MAGIC 0x41425442 /* 'ABTB' for bno tree */ +#define XFS_ABTC_MAGIC 0x41425443 /* 'ABTC' for cnt tree */ /* * Data record/key structure @@ -60,13 +60,13 @@ typedef struct xfs_alloc_rec typedef xfs_agblock_t xfs_alloc_ptr_t; /* btree pointer type */ /* btree block header type */ -typedef struct xfs_btree_sblock xfs_alloc_block_t; +typedef struct xfs_btree_sblock xfs_alloc_block_t; #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_BUF_TO_ALLOC_BLOCK) xfs_alloc_block_t *xfs_buf_to_alloc_block(struct xfs_buf *bp); -#define XFS_BUF_TO_ALLOC_BLOCK(bp) xfs_buf_to_alloc_block(bp) +#define XFS_BUF_TO_ALLOC_BLOCK(bp) xfs_buf_to_alloc_block(bp) #else -#define XFS_BUF_TO_ALLOC_BLOCK(bp) ((xfs_alloc_block_t *)(XFS_BUF_PTR(bp))) +#define XFS_BUF_TO_ALLOC_BLOCK(bp) ((xfs_alloc_block_t *)(XFS_BUF_PTR(bp))) #endif /* @@ -75,23 +75,23 @@ xfs_alloc_block_t *xfs_buf_to_alloc_block(struct xfs_buf *bp); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_ALLOC_BLOCK_SIZE) int xfs_alloc_block_size(int lev, struct xfs_btree_cur *cur); -#define XFS_ALLOC_BLOCK_SIZE(lev,cur) xfs_alloc_block_size(lev,cur) +#define XFS_ALLOC_BLOCK_SIZE(lev,cur) xfs_alloc_block_size(lev,cur) #else -#define XFS_ALLOC_BLOCK_SIZE(lev,cur) (1 << (cur)->bc_blocklog) +#define XFS_ALLOC_BLOCK_SIZE(lev,cur) (1 << (cur)->bc_blocklog) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_ALLOC_BLOCK_MAXRECS) int xfs_alloc_block_maxrecs(int lev, struct xfs_btree_cur *cur); -#define XFS_ALLOC_BLOCK_MAXRECS(lev,cur) xfs_alloc_block_maxrecs(lev,cur) +#define XFS_ALLOC_BLOCK_MAXRECS(lev,cur) xfs_alloc_block_maxrecs(lev,cur) #else -#define XFS_ALLOC_BLOCK_MAXRECS(lev,cur) \ +#define XFS_ALLOC_BLOCK_MAXRECS(lev,cur) \ ((cur)->bc_mp->m_alloc_mxr[lev != 0]) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_ALLOC_BLOCK_MINRECS) int xfs_alloc_block_minrecs(int lev, struct xfs_btree_cur *cur); -#define XFS_ALLOC_BLOCK_MINRECS(lev,cur) xfs_alloc_block_minrecs(lev,cur) +#define XFS_ALLOC_BLOCK_MINRECS(lev,cur) xfs_alloc_block_minrecs(lev,cur) #else -#define XFS_ALLOC_BLOCK_MINRECS(lev,cur) \ +#define XFS_ALLOC_BLOCK_MINRECS(lev,cur) \ ((cur)->bc_mp->m_alloc_mnr[lev != 0]) #endif @@ -115,15 +115,15 @@ int xfs_alloc_block_minrecs(int lev, struct xfs_btree_cur *cur); */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_BNO_BLOCK) xfs_agblock_t xfs_bno_block(struct xfs_mount *mp); -#define XFS_BNO_BLOCK(mp) xfs_bno_block(mp) +#define XFS_BNO_BLOCK(mp) xfs_bno_block(mp) #else -#define XFS_BNO_BLOCK(mp) ((xfs_agblock_t)(XFS_AGFL_BLOCK(mp) + 1)) +#define XFS_BNO_BLOCK(mp) ((xfs_agblock_t)(XFS_AGFL_BLOCK(mp) + 1)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_CNT_BLOCK) xfs_agblock_t xfs_cnt_block(struct xfs_mount *mp); -#define XFS_CNT_BLOCK(mp) xfs_cnt_block(mp) +#define XFS_CNT_BLOCK(mp) xfs_cnt_block(mp) #else -#define XFS_CNT_BLOCK(mp) ((xfs_agblock_t)(XFS_BNO_BLOCK(mp) + 1)) +#define XFS_CNT_BLOCK(mp) ((xfs_agblock_t)(XFS_BNO_BLOCK(mp) + 1)) #endif /* @@ -132,9 +132,9 @@ xfs_agblock_t xfs_cnt_block(struct xfs_mount *mp); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_ALLOC_REC_ADDR) xfs_alloc_rec_t *xfs_alloc_rec_addr(xfs_alloc_block_t *bb, int i, struct xfs_btree_cur *cur); -#define XFS_ALLOC_REC_ADDR(bb,i,cur) xfs_alloc_rec_addr(bb,i,cur) +#define XFS_ALLOC_REC_ADDR(bb,i,cur) xfs_alloc_rec_addr(bb,i,cur) #else -#define XFS_ALLOC_REC_ADDR(bb,i,cur) \ +#define XFS_ALLOC_REC_ADDR(bb,i,cur) \ XFS_BTREE_REC_ADDR(XFS_ALLOC_BLOCK_SIZE(0,cur), xfs_alloc, bb, i, \ XFS_ALLOC_BLOCK_MAXRECS(0, cur)) #endif @@ -142,9 +142,9 @@ xfs_alloc_rec_t *xfs_alloc_rec_addr(xfs_alloc_block_t *bb, int i, #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_ALLOC_KEY_ADDR) xfs_alloc_key_t *xfs_alloc_key_addr(xfs_alloc_block_t *bb, int i, struct xfs_btree_cur *cur); -#define XFS_ALLOC_KEY_ADDR(bb,i,cur) xfs_alloc_key_addr(bb,i,cur) +#define XFS_ALLOC_KEY_ADDR(bb,i,cur) xfs_alloc_key_addr(bb,i,cur) #else -#define XFS_ALLOC_KEY_ADDR(bb,i,cur) \ +#define XFS_ALLOC_KEY_ADDR(bb,i,cur) \ XFS_BTREE_KEY_ADDR(XFS_ALLOC_BLOCK_SIZE(1,cur), xfs_alloc, bb, i, \ XFS_ALLOC_BLOCK_MAXRECS(1, cur)) #endif @@ -152,9 +152,9 @@ xfs_alloc_key_t *xfs_alloc_key_addr(xfs_alloc_block_t *bb, int i, #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_ALLOC_PTR_ADDR) xfs_alloc_ptr_t *xfs_alloc_ptr_addr(xfs_alloc_block_t *bb, int i, struct xfs_btree_cur *cur); -#define XFS_ALLOC_PTR_ADDR(bb,i,cur) xfs_alloc_ptr_addr(bb,i,cur) +#define XFS_ALLOC_PTR_ADDR(bb,i,cur) xfs_alloc_ptr_addr(bb,i,cur) #else -#define XFS_ALLOC_PTR_ADDR(bb,i,cur) \ +#define XFS_ALLOC_PTR_ADDR(bb,i,cur) \ XFS_BTREE_PTR_ADDR(XFS_ALLOC_BLOCK_SIZE(1,cur), xfs_alloc, bb, i, \ XFS_ALLOC_BLOCK_MAXRECS(1, cur)) #endif @@ -171,7 +171,7 @@ int /* error */ xfs_alloc_decrement( struct xfs_btree_cur *cur, /* btree cursor */ int level, /* level in btree, 0 is leaf */ - int *stat); /* success/failure */ + int *stat); /* success/failure */ /* * Delete the record pointed to by cur. @@ -181,7 +181,7 @@ xfs_alloc_decrement( int /* error */ xfs_alloc_delete( struct xfs_btree_cur *cur, /* btree cursor */ - int *stat); /* success/failure */ + int *stat); /* success/failure */ /* * Get the data from the pointed-to record. @@ -191,7 +191,7 @@ xfs_alloc_get_rec( struct xfs_btree_cur *cur, /* btree cursor */ xfs_agblock_t *bno, /* output: starting block of extent */ xfs_extlen_t *len, /* output: length of extent */ - int *stat); /* output: success/failure */ + int *stat); /* output: success/failure */ /* * Increment cursor by one record at the level. @@ -201,7 +201,7 @@ int /* error */ xfs_alloc_increment( struct xfs_btree_cur *cur, /* btree cursor */ int level, /* level in btree, 0 is leaf */ - int *stat); /* success/failure */ + int *stat); /* success/failure */ /* * Insert the current record at the point referenced by cur. @@ -210,7 +210,7 @@ xfs_alloc_increment( int /* error */ xfs_alloc_insert( struct xfs_btree_cur *cur, /* btree cursor */ - int *stat); /* success/failure */ + int *stat); /* success/failure */ /* * Lookup the record equal to [bno, len] in the btree given by cur. @@ -220,7 +220,7 @@ xfs_alloc_lookup_eq( struct xfs_btree_cur *cur, /* btree cursor */ xfs_agblock_t bno, /* starting block of extent */ xfs_extlen_t len, /* length of extent */ - int *stat); /* success/failure */ + int *stat); /* success/failure */ /* * Lookup the first record greater than or equal to [bno, len] @@ -231,7 +231,7 @@ xfs_alloc_lookup_ge( struct xfs_btree_cur *cur, /* btree cursor */ xfs_agblock_t bno, /* starting block of extent */ xfs_extlen_t len, /* length of extent */ - int *stat); /* success/failure */ + int *stat); /* success/failure */ /* * Lookup the first record less than or equal to [bno, len] @@ -242,7 +242,7 @@ xfs_alloc_lookup_le( struct xfs_btree_cur *cur, /* btree cursor */ xfs_agblock_t bno, /* starting block of extent */ xfs_extlen_t len, /* length of extent */ - int *stat); /* success/failure */ + int *stat); /* success/failure */ /* * Update the record referred to by cur, to the value given by [bno, len]. diff --git a/include/xfs_arch.h b/include/xfs_arch.h index eb09e7a99..d22e57c76 100644 --- a/include/xfs_arch.h +++ b/include/xfs_arch.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. diff --git a/include/xfs_attr_leaf.h b/include/xfs_attr_leaf.h index 8d301be59..97b213a4b 100644 --- a/include/xfs_attr_leaf.h +++ b/include/xfs_attr_leaf.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_ATTR_LEAF_H__ -#define __XFS_ATTR_LEAF_H__ +#define __XFS_ATTR_LEAF_H__ /* * Attribute storage layout, internal structure, access macros, etc. @@ -38,7 +38,7 @@ * Attribute lists are structured around Btrees where all the data * elements are in the leaf nodes. Attribute names are hashed into an int, * then that int is used as the index into the Btree. Since the hashval - * of an attribute name may not be unique, we may have duplicate keys. The + * of an attribute name may not be unique, we may have duplicate keys. The * internal links in the Btree are logical block offsets into the file. */ @@ -58,7 +58,7 @@ struct xfs_trans; /* * This is the structure of the leaf nodes in the Btree. * - * Struct leaf_entry's are packed from the top. Name/values grow from the + * Struct leaf_entry's are packed from the top. Name/values grow from the * bottom but are not packed. The freemap contains run-length-encoded entries * for the free bytes after the leaf_entry's, but only the N largest such, * smaller runs are dropped. When the freemap doesn't show enough space @@ -76,10 +76,10 @@ struct xfs_trans; * the leaf_entry. The namespaces are independent only because we also look * at the root/user bit when we are looking for a matching attribute name. * - * We also store a "incomplete" bit in the leaf_entry. It shows that an + * We also store a "incomplete" bit in the leaf_entry. It shows that an * attribute is in the middle of being created and should not be shown to * the user if we crash during the time that the bit is set. We clear the - * bit when we have finished setting up the attribute. We do this because + * bit when we have finished setting up the attribute. We do this because * we cannot create some large attributes inside a single transaction, and we * need some indication that we weren't finished if we crash in the middle. */ @@ -127,9 +127,9 @@ typedef struct xfs_attr_leaf_name_remote xfs_attr_leaf_name_remote_t; * NOTE: the INCOMPLETE bit must not collide with the flags bits specified * on the system call, they are "or"ed together for various operations. */ -#define XFS_ATTR_LOCAL_BIT 0 /* attr is stored locally */ -#define XFS_ATTR_ROOT_BIT 1 /* limit access to attr to userid 0 */ -#define XFS_ATTR_INCOMPLETE_BIT 7 /* attr in middle of create/delete */ +#define XFS_ATTR_LOCAL_BIT 0 /* attr is stored locally */ +#define XFS_ATTR_ROOT_BIT 1 /* limit access to attr to userid 0 */ +#define XFS_ATTR_INCOMPLETE_BIT 7 /* attr in middle of create/delete */ #define XFS_ATTR_LOCAL (1 << XFS_ATTR_LOCAL_BIT) #define XFS_ATTR_ROOT (1 << XFS_ATTR_ROOT_BIT) #define XFS_ATTR_INCOMPLETE (1 << XFS_ATTR_INCOMPLETE_BIT) @@ -138,7 +138,7 @@ typedef struct xfs_attr_leaf_name_remote xfs_attr_leaf_name_remote_t; * Alignment for namelist and valuelist entries (since they are mixed * there can be only one alignment value) */ -#define XFS_ATTR_LEAF_NAME_ALIGN ((uint)sizeof(xfs_dablk_t)) +#define XFS_ATTR_LEAF_NAME_ALIGN ((uint)sizeof(xfs_dablk_t)) /* * Cast typed pointers for "local" and "remote" name/value structs. @@ -211,11 +211,11 @@ int xfs_attr_leaf_entsize_local_max(int bsize); typedef struct xfs_attr_list_context { struct xfs_inode *dp; /* inode */ struct attrlist_cursor_kern *cursor;/* position in list */ - struct attrlist *alist; /* output buffer */ + struct attrlist *alist; /* output buffer */ int count; /* num used entries */ - int dupcnt; /* count dup hashvals seen */ + int dupcnt; /* count dup hashvals seen */ int bufsize;/* total buffer size */ - int firstu; /* first used byte in buffer */ + int firstu; /* first used byte in buffer */ int flags; /* from VOP call */ int resynch;/* T/F: resynch with cursor */ } xfs_attr_list_context_t; diff --git a/include/xfs_attr_sf.h b/include/xfs_attr_sf.h index 6071fe0e5..cbfc04ad8 100644 --- a/include/xfs_attr_sf.h +++ b/include/xfs_attr_sf.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_ATTR_SF_H__ -#define __XFS_ATTR_SF_H__ +#define __XFS_ATTR_SF_H__ /* * Attribute storage when stored inside the inode. @@ -105,7 +105,7 @@ int xfs_attr_sf_totsize(struct xfs_inode *dp); #endif #ifdef XFS_ALL_TRACE -#define XFS_ATTR_TRACE +#define XFS_ATTR_TRACE #endif #if !defined(DEBUG) @@ -120,15 +120,15 @@ struct xfs_da_intnode; struct xfs_da_node_entry; struct xfs_attr_leafblock; -#define XFS_ATTR_TRACE_SIZE 4096 /* size of global trace buffer */ +#define XFS_ATTR_TRACE_SIZE 4096 /* size of global trace buffer */ /* * Trace record types. */ -#define XFS_ATTR_KTRACE_L_C 1 /* context */ -#define XFS_ATTR_KTRACE_L_CN 2 /* context, node */ -#define XFS_ATTR_KTRACE_L_CB 3 /* context, btree */ -#define XFS_ATTR_KTRACE_L_CL 4 /* context, leaf */ +#define XFS_ATTR_KTRACE_L_C 1 /* context */ +#define XFS_ATTR_KTRACE_L_CN 2 /* context, node */ +#define XFS_ATTR_KTRACE_L_CB 3 /* context, btree */ +#define XFS_ATTR_KTRACE_L_CL 4 /* context, leaf */ #if defined(XFS_ATTR_TRACE) @@ -148,10 +148,10 @@ void xfs_attr_trace_enter(int type, char *where, __psunsigned_t a12, __psunsigned_t a13, __psunsigned_t a14, __psunsigned_t a15); #else -#define xfs_attr_trace_l_c(w,c) -#define xfs_attr_trace_l_cn(w,c,n) -#define xfs_attr_trace_l_cb(w,c,b) -#define xfs_attr_trace_l_cl(w,c,l) +#define xfs_attr_trace_l_c(w,c) +#define xfs_attr_trace_l_cn(w,c,n) +#define xfs_attr_trace_l_cb(w,c,b) +#define xfs_attr_trace_l_cl(w,c,l) #endif /* XFS_ATTR_TRACE */ #endif /* __XFS_ATTR_SF_H__ */ diff --git a/include/xfs_bit.h b/include/xfs_bit.h index ed5483fa3..1e7f57ddf 100644 --- a/include/xfs_bit.h +++ b/include/xfs_bit.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_BIT_H__ -#define __XFS_BIT_H__ +#define __XFS_BIT_H__ /* * XFS bit manipulation routines. @@ -41,27 +41,27 @@ */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_MASK32HI) __uint32_t xfs_mask32hi(int n); -#define XFS_MASK32HI(n) xfs_mask32hi(n) +#define XFS_MASK32HI(n) xfs_mask32hi(n) #else -#define XFS_MASK32HI(n) ((__uint32_t)-1 << (32 - (n))) +#define XFS_MASK32HI(n) ((__uint32_t)-1 << (32 - (n))) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_MASK64HI) __uint64_t xfs_mask64hi(int n); -#define XFS_MASK64HI(n) xfs_mask64hi(n) +#define XFS_MASK64HI(n) xfs_mask64hi(n) #else -#define XFS_MASK64HI(n) ((__uint64_t)-1 << (64 - (n))) +#define XFS_MASK64HI(n) ((__uint64_t)-1 << (64 - (n))) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_MASK32LO) __uint32_t xfs_mask32lo(int n); -#define XFS_MASK32LO(n) xfs_mask32lo(n) +#define XFS_MASK32LO(n) xfs_mask32lo(n) #else -#define XFS_MASK32LO(n) (((__uint32_t)1 << (n)) - 1) +#define XFS_MASK32LO(n) (((__uint32_t)1 << (n)) - 1) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_MASK64LO) __uint64_t xfs_mask64lo(int n); -#define XFS_MASK64LO(n) xfs_mask64lo(n) +#define XFS_MASK64LO(n) xfs_mask64lo(n) #else -#define XFS_MASK64LO(n) (((__uint64_t)1 << (n)) - 1) +#define XFS_MASK64LO(n) (((__uint64_t)1 << (n)) - 1) #endif /* Get high bit set out of 32-bit argument, -1 if none set */ diff --git a/include/xfs_bmap.h b/include/xfs_bmap.h index a41ea99c0..5cc5bfe82 100644 --- a/include/xfs_bmap.h +++ b/include/xfs_bmap.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_BMAP_H__ -#define __XFS_BMAP_H__ +#define __XFS_BMAP_H__ struct getbmap; struct xfs_bmbt_irec; @@ -52,19 +52,19 @@ typedef struct xfs_bmap_free_item /* * Header for free extent list. */ -typedef struct xfs_bmap_free +typedef struct xfs_bmap_free { xfs_bmap_free_item_t *xbf_first; /* list of to-be-free extents */ int xbf_count; /* count of items on list */ int xbf_low; /* kludge: alloc in low mode */ } xfs_bmap_free_t; -#define XFS_BMAP_MAX_NMAP 4 +#define XFS_BMAP_MAX_NMAP 4 /* * Flags for xfs_bmapi */ -#define XFS_BMAPI_WRITE 0x001 /* write operation: allocate space */ +#define XFS_BMAPI_WRITE 0x001 /* write operation: allocate space */ #define XFS_BMAPI_DELAY 0x002 /* delayed write operation */ #define XFS_BMAPI_ENTIRE 0x004 /* return entire extent, not trimmed */ #define XFS_BMAPI_METADATA 0x008 /* mapping metadata not user data */ @@ -72,37 +72,37 @@ typedef struct xfs_bmap_free #define XFS_BMAPI_ATTRFORK 0x020 /* use attribute fork not data */ #define XFS_BMAPI_ASYNC 0x040 /* bunmapi xactions can be async */ #define XFS_BMAPI_RSVBLOCKS 0x080 /* OK to alloc. reserved data blocks */ -#define XFS_BMAPI_PREALLOC 0x100 /* preallocation op: unwritten space */ -#define XFS_BMAPI_IGSTATE 0x200 /* Ignore state - */ +#define XFS_BMAPI_PREALLOC 0x100 /* preallocation op: unwritten space */ +#define XFS_BMAPI_IGSTATE 0x200 /* Ignore state - */ /* combine contig. space */ -#define XFS_BMAPI_CONTIG 0x400 /* must allocate only one extent */ +#define XFS_BMAPI_CONTIG 0x400 /* must allocate only one extent */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_BMAPI_AFLAG) int xfs_bmapi_aflag(int w); -#define XFS_BMAPI_AFLAG(w) xfs_bmapi_aflag(w) +#define XFS_BMAPI_AFLAG(w) xfs_bmapi_aflag(w) #else -#define XFS_BMAPI_AFLAG(w) ((w) == XFS_ATTR_FORK ? XFS_BMAPI_ATTRFORK : 0) +#define XFS_BMAPI_AFLAG(w) ((w) == XFS_ATTR_FORK ? XFS_BMAPI_ATTRFORK : 0) #endif /* * Special values for xfs_bmbt_irec_t br_startblock field. */ -#define DELAYSTARTBLOCK ((xfs_fsblock_t)-1LL) -#define HOLESTARTBLOCK ((xfs_fsblock_t)-2LL) +#define DELAYSTARTBLOCK ((xfs_fsblock_t)-1LL) +#define HOLESTARTBLOCK ((xfs_fsblock_t)-2LL) /* * Trace operations for bmap extent tracing */ -#define XFS_BMAP_KTRACE_DELETE 1 -#define XFS_BMAP_KTRACE_INSERT 2 -#define XFS_BMAP_KTRACE_PRE_UP 3 -#define XFS_BMAP_KTRACE_POST_UP 4 +#define XFS_BMAP_KTRACE_DELETE 1 +#define XFS_BMAP_KTRACE_INSERT 2 +#define XFS_BMAP_KTRACE_PRE_UP 3 +#define XFS_BMAP_KTRACE_POST_UP 4 -#define XFS_BMAP_TRACE_SIZE 4096 /* size of global trace buffer */ -#define XFS_BMAP_KTRACE_SIZE 32 /* size of per-inode trace buffer */ +#define XFS_BMAP_TRACE_SIZE 4096 /* size of global trace buffer */ +#define XFS_BMAP_KTRACE_SIZE 32 /* size of per-inode trace buffer */ #if defined(XFS_ALL_TRACE) -#define XFS_BMAP_TRACE +#define XFS_BMAP_TRACE #endif #if !defined(DEBUG) @@ -112,9 +112,9 @@ int xfs_bmapi_aflag(int w); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_BMAP_INIT) void xfs_bmap_init(xfs_bmap_free_t *flp, xfs_fsblock_t *fbp); -#define XFS_BMAP_INIT(flp,fbp) xfs_bmap_init(flp,fbp) +#define XFS_BMAP_INIT(flp,fbp) xfs_bmap_init(flp,fbp) #else -#define XFS_BMAP_INIT(flp,fbp) \ +#define XFS_BMAP_INIT(flp,fbp) \ ((flp)->xbf_first = NULL, (flp)->xbf_count = 0, \ (flp)->xbf_low = 0, *(fbp) = NULLFSBLOCK) #endif @@ -128,17 +128,17 @@ typedef struct xfs_bmalloca { xfs_fileoff_t off; /* offset in file filling in */ struct xfs_trans *tp; /* transaction pointer */ struct xfs_inode *ip; /* incore inode pointer */ - struct xfs_bmbt_irec *prevp; /* extent before the new one */ + struct xfs_bmbt_irec *prevp; /* extent before the new one */ struct xfs_bmbt_irec *gotp; /* extent after, or delayed */ xfs_extlen_t alen; /* i/o length asked/allocated */ xfs_extlen_t total; /* total blocks needed for xaction */ - xfs_extlen_t minlen; /* mininum allocation size (blocks) */ + xfs_extlen_t minlen; /* mininum allocation size (blocks) */ xfs_extlen_t minleft; /* amount must be left after alloc */ char eof; /* set if allocating past last extent */ - char wasdel; /* replacing a delayed allocation */ + char wasdel; /* replacing a delayed allocation */ char userdata;/* set if is user data */ char low; /* low on space, using seq'l ags */ - char aeof; /* allocated space at eof */ + char aeof; /* allocated space at eof */ } xfs_bmalloca_t; #ifdef __KERNEL__ @@ -179,7 +179,7 @@ xfs_bmap_check_swappable( /* * Compute and fill in the value of the maximum depth of a bmap btree - * in this filesystem. Done once, during mount. + * in this filesystem. Done once, during mount. */ void xfs_bmap_compute_maxlevels( @@ -271,7 +271,7 @@ xfs_bmap_trace_exlist( xfs_extnum_t cnt, /* count of entries in list */ int whichfork); /* data or attr fork */ #else -#define xfs_bmap_trace_exlist(f,ip,c,w) +#define xfs_bmap_trace_exlist(f,ip,c,w) #endif /* @@ -319,7 +319,7 @@ xfs_bmapi_single( /* * Unmap (remove) blocks from a file. * If nexts is nonzero then the number of extents to remove is limited to - * that value. If not all extents in the block range can be removed then + * that value. If not all extents in the block range can be removed then * *done is set. */ int /* error */ @@ -364,10 +364,10 @@ xfs_bmap_isaeof( */ int xfs_bmap_eof( - struct xfs_inode *ip, - xfs_fileoff_t endoff, - int whichfork, - int *eof); + struct xfs_inode *ip, + xfs_fileoff_t endoff, + int whichfork, + int *eof); /* * Count fsblocks of the given fork. diff --git a/include/xfs_btree.h b/include/xfs_btree.h index 87067d647..93872bba4 100644 --- a/include/xfs_btree.h +++ b/include/xfs_btree.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_BTREE_H__ -#define __XFS_BTREE_H__ +#define __XFS_BTREE_H__ struct xfs_buf; struct xfs_bmap_free; @@ -41,14 +41,14 @@ struct xfs_trans; /* * This nonsense is to make -wlint happy. */ -#define XFS_LOOKUP_EQ ((xfs_lookup_t)XFS_LOOKUP_EQi) -#define XFS_LOOKUP_LE ((xfs_lookup_t)XFS_LOOKUP_LEi) -#define XFS_LOOKUP_GE ((xfs_lookup_t)XFS_LOOKUP_GEi) +#define XFS_LOOKUP_EQ ((xfs_lookup_t)XFS_LOOKUP_EQi) +#define XFS_LOOKUP_LE ((xfs_lookup_t)XFS_LOOKUP_LEi) +#define XFS_LOOKUP_GE ((xfs_lookup_t)XFS_LOOKUP_GEi) -#define XFS_BTNUM_BNO ((xfs_btnum_t)XFS_BTNUM_BNOi) -#define XFS_BTNUM_CNT ((xfs_btnum_t)XFS_BTNUM_CNTi) -#define XFS_BTNUM_BMAP ((xfs_btnum_t)XFS_BTNUM_BMAPi) -#define XFS_BTNUM_INO ((xfs_btnum_t)XFS_BTNUM_INOi) +#define XFS_BTNUM_BNO ((xfs_btnum_t)XFS_BTNUM_BNOi) +#define XFS_BTNUM_CNT ((xfs_btnum_t)XFS_BTNUM_CNTi) +#define XFS_BTNUM_BMAP ((xfs_btnum_t)XFS_BTNUM_BMAPi) +#define XFS_BTNUM_INO ((xfs_btnum_t)XFS_BTNUM_INOi) /* * Short form header: space allocation btrees. @@ -86,7 +86,7 @@ typedef struct xfs_btree_hdr typedef struct xfs_btree_block { - xfs_btree_hdr_t bb_h; /* header */ + xfs_btree_hdr_t bb_h; /* header */ union { struct { xfs_agblock_t bb_leftsib; @@ -102,28 +102,28 @@ typedef struct xfs_btree_block /* * For logging record fields. */ -#define XFS_BB_MAGIC 0x01 -#define XFS_BB_LEVEL 0x02 -#define XFS_BB_NUMRECS 0x04 -#define XFS_BB_LEFTSIB 0x08 -#define XFS_BB_RIGHTSIB 0x10 -#define XFS_BB_NUM_BITS 5 -#define XFS_BB_ALL_BITS ((1 << XFS_BB_NUM_BITS) - 1) +#define XFS_BB_MAGIC 0x01 +#define XFS_BB_LEVEL 0x02 +#define XFS_BB_NUMRECS 0x04 +#define XFS_BB_LEFTSIB 0x08 +#define XFS_BB_RIGHTSIB 0x10 +#define XFS_BB_NUM_BITS 5 +#define XFS_BB_ALL_BITS ((1 << XFS_BB_NUM_BITS) - 1) /* * Boolean to select which form of xfs_btree_block_t.bb_u to use. */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_BTREE_LONG_PTRS) int xfs_btree_long_ptrs(xfs_btnum_t btnum); -#define XFS_BTREE_LONG_PTRS(btnum) ((btnum) == XFS_BTNUM_BMAP) +#define XFS_BTREE_LONG_PTRS(btnum) ((btnum) == XFS_BTNUM_BMAP) #else -#define XFS_BTREE_LONG_PTRS(btnum) ((btnum) == XFS_BTNUM_BMAP) +#define XFS_BTREE_LONG_PTRS(btnum) ((btnum) == XFS_BTNUM_BMAP) #endif /* * Magic numbers for btree blocks. */ -extern const __uint32_t xfs_magics[]; +extern const __uint32_t xfs_magics[]; /* * Maximum and minimum records in a btree block. @@ -131,12 +131,12 @@ extern const __uint32_t xfs_magics[]; * The divisor below is equivalent to lf ? (e1) : (e2) but that produces * compiler warnings. */ -#define XFS_BTREE_BLOCK_MAXRECS(bsz,t,lf) \ +#define XFS_BTREE_BLOCK_MAXRECS(bsz,t,lf) \ ((int)(((bsz) - (uint)sizeof(t ## _block_t)) / \ (((lf) * (uint)sizeof(t ## _rec_t)) + \ ((1 - (lf)) * \ ((uint)sizeof(t ## _key_t) + (uint)sizeof(t ## _ptr_t)))))) -#define XFS_BTREE_BLOCK_MINRECS(bsz,t,lf) \ +#define XFS_BTREE_BLOCK_MINRECS(bsz,t,lf) \ (XFS_BTREE_BLOCK_MAXRECS(bsz,t,lf) / 2) /* @@ -144,17 +144,17 @@ extern const __uint32_t xfs_magics[]; * Given block size, type prefix, block pointer, and index of requested entry * (first entry numbered 1). */ -#define XFS_BTREE_REC_ADDR(bsz,t,bb,i,mxr) \ +#define XFS_BTREE_REC_ADDR(bsz,t,bb,i,mxr) \ ((t ## _rec_t *)((char *)(bb) + sizeof(t ## _block_t) + \ ((i) - 1) * sizeof(t ## _rec_t))) -#define XFS_BTREE_KEY_ADDR(bsz,t,bb,i,mxr) \ +#define XFS_BTREE_KEY_ADDR(bsz,t,bb,i,mxr) \ ((t ## _key_t *)((char *)(bb) + sizeof(t ## _block_t) + \ ((i) - 1) * sizeof(t ## _key_t))) -#define XFS_BTREE_PTR_ADDR(bsz,t,bb,i,mxr) \ +#define XFS_BTREE_PTR_ADDR(bsz,t,bb,i,mxr) \ ((t ## _ptr_t *)((char *)(bb) + sizeof(t ## _block_t) + \ (mxr) * sizeof(t ## _key_t) + ((i) - 1) * sizeof(t ## _ptr_t))) -#define XFS_BTREE_MAXLEVELS 8 /* max of all btrees */ +#define XFS_BTREE_MAXLEVELS 8 /* max of all btrees */ /* * Btree cursor structure. @@ -162,8 +162,8 @@ extern const __uint32_t xfs_magics[]; */ typedef struct xfs_btree_cur { - struct xfs_trans *bc_tp; /* transaction we're in, if any */ - struct xfs_mount *bc_mp; /* file system mount struct */ + struct xfs_trans *bc_tp; /* transaction we're in, if any */ + struct xfs_mount *bc_mp; /* file system mount struct */ union { xfs_alloc_rec_t a; xfs_bmbt_irec_t b; @@ -172,8 +172,8 @@ typedef struct xfs_btree_cur struct xfs_buf *bc_bufs[XFS_BTREE_MAXLEVELS]; /* buf ptr per level */ int bc_ptrs[XFS_BTREE_MAXLEVELS]; /* key/record # */ __uint8_t bc_ra[XFS_BTREE_MAXLEVELS]; /* readahead bits */ -#define XFS_BTCUR_LEFTRA 1 /* left sibling has been read-ahead */ -#define XFS_BTCUR_RIGHTRA 2 /* right sibling has been read-ahead */ +#define XFS_BTCUR_LEFTRA 1 /* left sibling has been read-ahead */ +#define XFS_BTCUR_RIGHTRA 2 /* right sibling has been read-ahead */ __uint8_t bc_nlevels; /* number of levels in the tree */ __uint8_t bc_blocklog; /* log2(blocksize) of btree blocks */ xfs_btnum_t bc_btnum; /* identifies which btree type */ @@ -190,7 +190,7 @@ typedef struct xfs_btree_cur short forksize; /* fork's inode space */ char whichfork; /* data or attr fork */ char flags; /* flags */ -#define XFS_BTCUR_BPRV_WASDEL 1 /* was delayed */ +#define XFS_BTCUR_BPRV_WASDEL 1 /* was delayed */ } b; struct { /* needed for INO */ struct xfs_buf *agbp; /* agi buffer pointer */ @@ -199,29 +199,29 @@ typedef struct xfs_btree_cur } bc_private; /* per-btree type data */ } xfs_btree_cur_t; -#define XFS_BTREE_NOERROR 0 -#define XFS_BTREE_ERROR 1 +#define XFS_BTREE_NOERROR 0 +#define XFS_BTREE_ERROR 1 /* * Convert from buffer to btree block header. */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_BUF_TO_BLOCK) xfs_btree_block_t *xfs_buf_to_block(struct xfs_buf *bp); -#define XFS_BUF_TO_BLOCK(bp) xfs_buf_to_block(bp) +#define XFS_BUF_TO_BLOCK(bp) xfs_buf_to_block(bp) #else -#define XFS_BUF_TO_BLOCK(bp) ((xfs_btree_block_t *)(XFS_BUF_PTR(bp))) +#define XFS_BUF_TO_BLOCK(bp) ((xfs_btree_block_t *)(XFS_BUF_PTR(bp))) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_BUF_TO_LBLOCK) xfs_btree_lblock_t *xfs_buf_to_lblock(struct xfs_buf *bp); -#define XFS_BUF_TO_LBLOCK(bp) xfs_buf_to_lblock(bp) +#define XFS_BUF_TO_LBLOCK(bp) xfs_buf_to_lblock(bp) #else -#define XFS_BUF_TO_LBLOCK(bp) ((xfs_btree_lblock_t *)(XFS_BUF_PTR(bp))) +#define XFS_BUF_TO_LBLOCK(bp) ((xfs_btree_lblock_t *)(XFS_BUF_PTR(bp))) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_BUF_TO_SBLOCK) xfs_btree_sblock_t *xfs_buf_to_sblock(struct xfs_buf *bp); -#define XFS_BUF_TO_SBLOCK(bp) xfs_buf_to_sblock(bp) +#define XFS_BUF_TO_SBLOCK(bp) xfs_buf_to_sblock(bp) #else -#define XFS_BUF_TO_SBLOCK(bp) ((xfs_btree_sblock_t *)(XFS_BUF_PTR(bp))) +#define XFS_BUF_TO_SBLOCK(bp) ((xfs_btree_sblock_t *)(XFS_BUF_PTR(bp))) #endif #ifdef __KERNEL__ @@ -233,7 +233,7 @@ xfs_btree_sblock_t *xfs_buf_to_sblock(struct xfs_buf *bp); void xfs_btree_check_block( xfs_btree_cur_t *cur, /* btree cursor */ - xfs_btree_block_t *block, /* generic btree block pointer */ + xfs_btree_block_t *block, /* generic btree block pointer */ int level, /* level of the btree block */ struct xfs_buf *bp); /* buffer containing block, if any */ @@ -255,9 +255,9 @@ xfs_btree_check_rec( void *ar1, /* pointer to left (lower) record */ void *ar2); /* pointer to right (higher) record */ #else -#define xfs_btree_check_block(a,b,c,d) -#define xfs_btree_check_key(a,b,c) -#define xfs_btree_check_rec(a,b,c) +#define xfs_btree_check_block(a,b,c,d) +#define xfs_btree_check_key(a,b,c) +#define xfs_btree_check_rec(a,b,c) #endif /* DEBUG */ /* @@ -266,7 +266,7 @@ xfs_btree_check_rec( int /* error (0 or EFSCORRUPTED) */ xfs_btree_check_lblock( xfs_btree_cur_t *cur, /* btree cursor */ - xfs_btree_lblock_t *block, /* btree long form block pointer */ + xfs_btree_lblock_t *block, /* btree long form block pointer */ int level, /* level of the btree block */ struct xfs_buf *bp); /* buffer containing block, if any */ @@ -277,7 +277,7 @@ int /* error (0 or EFSCORRUPTED) */ xfs_btree_check_lptr( xfs_btree_cur_t *cur, /* btree cursor */ xfs_dfsbno_t ptr, /* btree block disk address */ - int level); /* btree block level */ + int level); /* btree block level */ /* * Checking routine: check that short form block header is ok. @@ -285,7 +285,7 @@ xfs_btree_check_lptr( int /* error (0 or EFSCORRUPTED) */ xfs_btree_check_sblock( xfs_btree_cur_t *cur, /* btree cursor */ - xfs_btree_sblock_t *block, /* btree short form block pointer */ + xfs_btree_sblock_t *block, /* btree short form block pointer */ int level, /* level of the btree block */ struct xfs_buf *bp); /* buffer containing block */ @@ -296,7 +296,7 @@ int /* error (0 or EFSCORRUPTED) */ xfs_btree_check_sptr( xfs_btree_cur_t *cur, /* btree cursor */ xfs_agblock_t ptr, /* btree block disk address */ - int level); /* btree block level */ + int level); /* btree block level */ /* * Delete the btree cursor. @@ -304,7 +304,7 @@ xfs_btree_check_sptr( void xfs_btree_del_cursor( xfs_btree_cur_t *cur, /* btree cursor */ - int error); /* del because of error */ + int error); /* del because of error */ /* * Duplicate the btree cursor. @@ -317,12 +317,12 @@ xfs_btree_dup_cursor( /* * Change the cursor to point to the first record in the current block - * at the given level. Other levels are unaffected. + * at the given level. Other levels are unaffected. */ int /* success=1, failure=0 */ xfs_btree_firstrec( xfs_btree_cur_t *cur, /* btree cursor */ - int level); /* level to change */ + int level); /* level to change */ /* * Retrieve the block pointer from the cursor at the given level. @@ -332,7 +332,7 @@ xfs_btree_block_t * /* generic btree block pointer */ xfs_btree_get_block( xfs_btree_cur_t *cur, /* btree cursor */ int level, /* level in btree */ - struct xfs_buf **bpp); /* buffer containing the block */ + struct xfs_buf **bpp); /* buffer containing the block */ /* * Get a buffer for the block, return it with no data read. @@ -377,16 +377,16 @@ xfs_btree_init_cursor( int /* 1=is last block, 0=not last block */ xfs_btree_islastblock( xfs_btree_cur_t *cur, /* btree cursor */ - int level); /* level to check */ + int level); /* level to check */ /* * Change the cursor to point to the last record in the current block - * at the given level. Other levels are unaffected. + * at the given level. Other levels are unaffected. */ int /* success=1, failure=0 */ xfs_btree_lastrec( xfs_btree_cur_t *cur, /* btree cursor */ - int level); /* level to change */ + int level); /* level to change */ /* * Compute first and last byte offsets for the fields given. @@ -394,11 +394,11 @@ xfs_btree_lastrec( */ void xfs_btree_offsets( - __int64_t fields, /* bitmask of fields */ + __int64_t fields, /* bitmask of fields */ const short *offsets,/* table of field offsets */ int nbits, /* number of bits to inspect */ - int *first, /* output: first byte offset */ - int *last); /* output: last byte offset */ + int *first, /* output: first byte offset */ + int *last); /* output: last byte offset */ /* * Get a buffer for the block, return it read in. @@ -435,7 +435,7 @@ void /* error */ xfs_btree_reada_bufl( struct xfs_mount *mp, /* file system mount point */ xfs_fsblock_t fsbno, /* file system block number */ - xfs_extlen_t count); /* count of filesystem blocks */ + xfs_extlen_t count); /* count of filesystem blocks */ /* * Read-ahead the block, don't wait for it, don't return a buffer. @@ -446,7 +446,7 @@ xfs_btree_reada_bufs( struct xfs_mount *mp, /* file system mount point */ xfs_agnumber_t agno, /* allocation group number */ xfs_agblock_t agbno, /* allocation group block number */ - xfs_extlen_t count); /* count of filesystem blocks */ + xfs_extlen_t count); /* count of filesystem blocks */ /* * Read-ahead btree blocks, at the given level. @@ -489,76 +489,76 @@ xfs_btree_setbuf( */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_EXTLEN_MIN) xfs_extlen_t xfs_extlen_min(xfs_extlen_t a, xfs_extlen_t b); -#define XFS_EXTLEN_MIN(a,b) xfs_extlen_min(a,b) +#define XFS_EXTLEN_MIN(a,b) xfs_extlen_min(a,b) #else -#define XFS_EXTLEN_MIN(a,b) \ +#define XFS_EXTLEN_MIN(a,b) \ ((xfs_extlen_t)(a) < (xfs_extlen_t)(b) ? \ (xfs_extlen_t)(a) : (xfs_extlen_t)(b)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_EXTLEN_MAX) xfs_extlen_t xfs_extlen_max(xfs_extlen_t a, xfs_extlen_t b); -#define XFS_EXTLEN_MAX(a,b) xfs_extlen_max(a,b) +#define XFS_EXTLEN_MAX(a,b) xfs_extlen_max(a,b) #else -#define XFS_EXTLEN_MAX(a,b) \ +#define XFS_EXTLEN_MAX(a,b) \ ((xfs_extlen_t)(a) > (xfs_extlen_t)(b) ? \ (xfs_extlen_t)(a) : (xfs_extlen_t)(b)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AGBLOCK_MIN) xfs_agblock_t xfs_agblock_min(xfs_agblock_t a, xfs_agblock_t b); -#define XFS_AGBLOCK_MIN(a,b) xfs_agblock_min(a,b) +#define XFS_AGBLOCK_MIN(a,b) xfs_agblock_min(a,b) #else -#define XFS_AGBLOCK_MIN(a,b) \ +#define XFS_AGBLOCK_MIN(a,b) \ ((xfs_agblock_t)(a) < (xfs_agblock_t)(b) ? \ (xfs_agblock_t)(a) : (xfs_agblock_t)(b)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AGBLOCK_MAX) xfs_agblock_t xfs_agblock_max(xfs_agblock_t a, xfs_agblock_t b); -#define XFS_AGBLOCK_MAX(a,b) xfs_agblock_max(a,b) +#define XFS_AGBLOCK_MAX(a,b) xfs_agblock_max(a,b) #else -#define XFS_AGBLOCK_MAX(a,b) \ +#define XFS_AGBLOCK_MAX(a,b) \ ((xfs_agblock_t)(a) > (xfs_agblock_t)(b) ? \ (xfs_agblock_t)(a) : (xfs_agblock_t)(b)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_FILEOFF_MIN) xfs_fileoff_t xfs_fileoff_min(xfs_fileoff_t a, xfs_fileoff_t b); -#define XFS_FILEOFF_MIN(a,b) xfs_fileoff_min(a,b) +#define XFS_FILEOFF_MIN(a,b) xfs_fileoff_min(a,b) #else -#define XFS_FILEOFF_MIN(a,b) \ +#define XFS_FILEOFF_MIN(a,b) \ ((xfs_fileoff_t)(a) < (xfs_fileoff_t)(b) ? \ (xfs_fileoff_t)(a) : (xfs_fileoff_t)(b)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_FILEOFF_MAX) xfs_fileoff_t xfs_fileoff_max(xfs_fileoff_t a, xfs_fileoff_t b); -#define XFS_FILEOFF_MAX(a,b) xfs_fileoff_max(a,b) +#define XFS_FILEOFF_MAX(a,b) xfs_fileoff_max(a,b) #else -#define XFS_FILEOFF_MAX(a,b) \ +#define XFS_FILEOFF_MAX(a,b) \ ((xfs_fileoff_t)(a) > (xfs_fileoff_t)(b) ? \ (xfs_fileoff_t)(a) : (xfs_fileoff_t)(b)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_FILBLKS_MIN) xfs_filblks_t xfs_filblks_min(xfs_filblks_t a, xfs_filblks_t b); -#define XFS_FILBLKS_MIN(a,b) xfs_filblks_min(a,b) +#define XFS_FILBLKS_MIN(a,b) xfs_filblks_min(a,b) #else -#define XFS_FILBLKS_MIN(a,b) \ +#define XFS_FILBLKS_MIN(a,b) \ ((xfs_filblks_t)(a) < (xfs_filblks_t)(b) ? \ (xfs_filblks_t)(a) : (xfs_filblks_t)(b)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_FILBLKS_MAX) xfs_filblks_t xfs_filblks_max(xfs_filblks_t a, xfs_filblks_t b); -#define XFS_FILBLKS_MAX(a,b) xfs_filblks_max(a,b) +#define XFS_FILBLKS_MAX(a,b) xfs_filblks_max(a,b) #else -#define XFS_FILBLKS_MAX(a,b) \ +#define XFS_FILBLKS_MAX(a,b) \ ((xfs_filblks_t)(a) > (xfs_filblks_t)(b) ? \ (xfs_filblks_t)(a) : (xfs_filblks_t)(b)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_FSB_SANITY_CHECK) int xfs_fsb_sanity_check(struct xfs_mount *mp, xfs_fsblock_t fsb); -#define XFS_FSB_SANITY_CHECK(mp,fsb) xfs_fsb_sanity_check(mp,fsb) +#define XFS_FSB_SANITY_CHECK(mp,fsb) xfs_fsb_sanity_check(mp,fsb) #else -#define XFS_FSB_SANITY_CHECK(mp,fsb) \ +#define XFS_FSB_SANITY_CHECK(mp,fsb) \ (XFS_FSB_TO_AGNO(mp, fsb) < mp->m_sb.sb_agcount && \ XFS_FSB_TO_AGBNO(mp, fsb) < mp->m_sb.sb_agblocks) #endif @@ -566,7 +566,7 @@ int xfs_fsb_sanity_check(struct xfs_mount *mp, xfs_fsblock_t fsb); /* * Macros to set EFSCORRUPTED & return/branch. */ -#define XFS_WANT_CORRUPTED_GOTO(x,l) \ +#define XFS_WANT_CORRUPTED_GOTO(x,l) \ { \ int fs_is_ok = (x); \ ASSERT(fs_is_ok); \ @@ -578,7 +578,7 @@ int xfs_fsb_sanity_check(struct xfs_mount *mp, xfs_fsblock_t fsb); } \ } -#define XFS_WANT_CORRUPTED_RETURN(x) \ +#define XFS_WANT_CORRUPTED_RETURN(x) \ { \ int fs_is_ok = (x); \ ASSERT(fs_is_ok); \ diff --git a/include/xfs_buf_item.h b/include/xfs_buf_item.h index 3cd9480f7..aa90b801d 100644 --- a/include/xfs_buf_item.h +++ b/include/xfs_buf_item.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -29,14 +29,14 @@ * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ -#ifndef __XFS_BUF_ITEM_H__ -#define __XFS_BUF_ITEM_H__ +#ifndef __XFS_BUF_ITEM_H__ +#define __XFS_BUF_ITEM_H__ /* * This is the structure used to lay out a buf log item in the - * log. The data map describes which 128 byte chunks of the buffer + * log. The data map describes which 128 byte chunks of the buffer * have been logged. This structure works only on buffers that - * reside up to the first TB in the filesystem. These buffers are + * reside up to the first TB in the filesystem. These buffers are * generated only by pre-6.2 systems and are known as XFS_LI_6_1_BUF. */ typedef struct xfs_buf_log_format_v1 { @@ -69,33 +69,33 @@ typedef struct xfs_buf_log_format_t { * This flag indicates that the buffer contains on disk inodes * and requires special recovery handling. */ -#define XFS_BLI_INODE_BUF 0x1 +#define XFS_BLI_INODE_BUF 0x1 /* * This flag indicates that the buffer should not be replayed * during recovery because its blocks are being freed. */ -#define XFS_BLI_CANCEL 0x2 +#define XFS_BLI_CANCEL 0x2 /* * This flag indicates that the buffer contains on disk * user or group dquots and may require special recovery handling. */ -#define XFS_BLI_UDQUOT_BUF 0x4 +#define XFS_BLI_UDQUOT_BUF 0x4 /* #define XFS_BLI_PDQUOT_BUF 0x8 */ -#define XFS_BLI_GDQUOT_BUF 0x10 +#define XFS_BLI_GDQUOT_BUF 0x10 -#define XFS_BLI_CHUNK 128 -#define XFS_BLI_SHIFT 7 -#define BIT_TO_WORD_SHIFT 5 -#define NBWORD (NBBY * sizeof(unsigned int)) +#define XFS_BLI_CHUNK 128 +#define XFS_BLI_SHIFT 7 +#define BIT_TO_WORD_SHIFT 5 +#define NBWORD (NBBY * sizeof(unsigned int)) /* * buf log item flags */ -#define XFS_BLI_HOLD 0x01 -#define XFS_BLI_DIRTY 0x02 -#define XFS_BLI_STALE 0x04 -#define XFS_BLI_LOGGED 0x08 -#define XFS_BLI_INODE_ALLOC_BUF 0x10 +#define XFS_BLI_HOLD 0x01 +#define XFS_BLI_DIRTY 0x02 +#define XFS_BLI_STALE 0x04 +#define XFS_BLI_LOGGED 0x08 +#define XFS_BLI_INODE_ALLOC_BUF 0x10 #ifdef __KERNEL__ @@ -136,11 +136,11 @@ typedef struct xfs_buf_cancel { struct xfs_buf_cancel *bc_next; } xfs_buf_cancel_t; -#define XFS_BLI_TRACE_SIZE 32 +#define XFS_BLI_TRACE_SIZE 32 #if defined(XFS_ALL_TRACE) -#define XFS_BLI_TRACE +#define XFS_BLI_TRACE #endif #if !defined(DEBUG) @@ -150,7 +150,7 @@ typedef struct xfs_buf_cancel { #if defined(XFS_BLI_TRACE) void xfs_buf_item_trace(char *, xfs_buf_log_item_t *); #else -#define xfs_buf_item_trace(id, bip) +#define xfs_buf_item_trace(id, bip) #endif void xfs_buf_item_init(struct xfs_buf *, struct xfs_mount *); @@ -170,7 +170,7 @@ xfs_buf_item_flush_log_debug( uint first, uint last); #else -#define xfs_buf_item_flush_log_debug(bp, first, last) +#define xfs_buf_item_flush_log_debug(bp, first, last) #endif #endif /* __KERNEL__ */ diff --git a/include/xfs_cap.h b/include/xfs_cap.h index aa9bf8817..2deac7303 100644 --- a/include/xfs_cap.h +++ b/include/xfs_cap.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -38,9 +38,9 @@ typedef __uint64_t xfs_cap_value_t; typedef struct xfs_cap_set { - xfs_cap_value_t cap_effective; /* use in capability checks */ - xfs_cap_value_t cap_permitted; /* combined with file attrs */ - xfs_cap_value_t cap_inheritable;/* pass through exec */ + xfs_cap_value_t cap_effective; /* use in capability checks */ + xfs_cap_value_t cap_permitted; /* combined with file attrs */ + xfs_cap_value_t cap_inheritable;/* pass through exec */ } xfs_cap_set_t; /* On-disk XFS extended attribute names */ @@ -81,4 +81,4 @@ extern int xfs_cap_vremove(struct vnode *vp); #endif /* __KERNEL__ */ -#endif /* __XFS_CAP_H__ */ +#endif /* __XFS_CAP_H__ */ diff --git a/include/xfs_da_btree.h b/include/xfs_da_btree.h index 7328bd26c..e575998a5 100644 --- a/include/xfs_da_btree.h +++ b/include/xfs_da_btree.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_DA_BTREE_H__ -#define __XFS_DA_BTREE_H__ +#define __XFS_DA_BTREE_H__ struct xfs_buf; struct xfs_bmap_free; @@ -52,10 +52,10 @@ struct zone; #define XFS_DA_NODE_MAGIC 0xfebe /* magic number: non-leaf blocks */ #define XFS_DIR_LEAF_MAGIC 0xfeeb /* magic number: directory leaf blks */ #define XFS_ATTR_LEAF_MAGIC 0xfbee /* magic number: attribute leaf blks */ -#define XFS_DIR2_LEAF1_MAGIC 0xd2f1 /* magic number: v2 dirlf single blks */ -#define XFS_DIR2_LEAFN_MAGIC 0xd2ff /* magic number: v2 dirlf multi blks */ +#define XFS_DIR2_LEAF1_MAGIC 0xd2f1 /* magic number: v2 dirlf single blks */ +#define XFS_DIR2_LEAFN_MAGIC 0xd2ff /* magic number: v2 dirlf multi blks */ -#define XFS_DIRX_LEAF_MAGIC(mp) \ +#define XFS_DIRX_LEAF_MAGIC(mp) \ (XFS_DIR_IS_V1(mp) ? XFS_DIR_LEAF_MAGIC : XFS_DIR2_LEAFN_MAGIC) typedef struct xfs_da_blkinfo { @@ -74,7 +74,7 @@ typedef struct xfs_da_blkinfo { * Since we have duplicate keys, use a binary search but always follow * all match in the block, not just the first match found. */ -#define XFS_DA_NODE_MAXDEPTH 5 /* max depth of Btree */ +#define XFS_DA_NODE_MAXDEPTH 5 /* max depth of Btree */ typedef struct xfs_da_intnode { struct xfs_da_node_hdr { /* constant-structure header block */ @@ -97,15 +97,15 @@ typedef struct xfs_da_node_entry xfs_da_node_entry_t; */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_LBSIZE) int xfs_lbsize(struct xfs_mount *mp); -#define XFS_LBSIZE(mp) xfs_lbsize(mp) +#define XFS_LBSIZE(mp) xfs_lbsize(mp) #else -#define XFS_LBSIZE(mp) ((mp)->m_sb.sb_blocksize) +#define XFS_LBSIZE(mp) ((mp)->m_sb.sb_blocksize) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_LBLOG) int xfs_lblog(struct xfs_mount *mp); -#define XFS_LBLOG(mp) xfs_lblog(mp) +#define XFS_LBLOG(mp) xfs_lblog(mp) #else -#define XFS_LBLOG(mp) ((mp)->m_sb.sb_blocklog) +#define XFS_LBLOG(mp) ((mp)->m_sb.sb_blocklog) #endif /* @@ -118,41 +118,41 @@ int xfs_lblog(struct xfs_mount *mp); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DA_MAKE_BNOENTRY) __uint32_t xfs_da_make_bnoentry(struct xfs_mount *mp, xfs_dablk_t bno, int entry); -#define XFS_DA_MAKE_BNOENTRY(mp,bno,entry) \ +#define XFS_DA_MAKE_BNOENTRY(mp,bno,entry) \ xfs_da_make_bnoentry(mp,bno,entry) #else -#define XFS_DA_MAKE_BNOENTRY(mp,bno,entry) \ +#define XFS_DA_MAKE_BNOENTRY(mp,bno,entry) \ (((bno) << (mp)->m_dircook_elog) | (entry)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DA_MAKE_COOKIE) xfs_off_t xfs_da_make_cookie(struct xfs_mount *mp, xfs_dablk_t bno, int entry, xfs_dahash_t hash); -#define XFS_DA_MAKE_COOKIE(mp,bno,entry,hash) \ +#define XFS_DA_MAKE_COOKIE(mp,bno,entry,hash) \ xfs_da_make_cookie(mp,bno,entry,hash) #else -#define XFS_DA_MAKE_COOKIE(mp,bno,entry,hash) \ +#define XFS_DA_MAKE_COOKIE(mp,bno,entry,hash) \ (((xfs_off_t)XFS_DA_MAKE_BNOENTRY(mp, bno, entry) << 32) | (hash)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DA_COOKIE_HASH) xfs_dahash_t xfs_da_cookie_hash(struct xfs_mount *mp, xfs_off_t cookie); -#define XFS_DA_COOKIE_HASH(mp,cookie) xfs_da_cookie_hash(mp,cookie) +#define XFS_DA_COOKIE_HASH(mp,cookie) xfs_da_cookie_hash(mp,cookie) #else -#define XFS_DA_COOKIE_HASH(mp,cookie) ((xfs_dahash_t)(cookie)) +#define XFS_DA_COOKIE_HASH(mp,cookie) ((xfs_dahash_t)(cookie)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DA_COOKIE_BNO) xfs_dablk_t xfs_da_cookie_bno(struct xfs_mount *mp, xfs_off_t cookie); -#define XFS_DA_COOKIE_BNO(mp,cookie) xfs_da_cookie_bno(mp,cookie) +#define XFS_DA_COOKIE_BNO(mp,cookie) xfs_da_cookie_bno(mp,cookie) #else -#define XFS_DA_COOKIE_BNO(mp,cookie) \ +#define XFS_DA_COOKIE_BNO(mp,cookie) \ (((xfs_off_t)(cookie) >> 31) == -1LL ? \ (xfs_dablk_t)0 : \ (xfs_dablk_t)((xfs_off_t)(cookie) >> ((mp)->m_dircook_elog + 32))) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DA_COOKIE_ENTRY) int xfs_da_cookie_entry(struct xfs_mount *mp, xfs_off_t cookie); -#define XFS_DA_COOKIE_ENTRY(mp,cookie) xfs_da_cookie_entry(mp,cookie) +#define XFS_DA_COOKIE_ENTRY(mp,cookie) xfs_da_cookie_entry(mp,cookie) #else -#define XFS_DA_COOKIE_ENTRY(mp,cookie) \ +#define XFS_DA_COOKIE_ENTRY(mp,cookie) \ (((xfs_off_t)(cookie) >> 31) == -1LL ? \ (xfs_dablk_t)0 : \ (xfs_dablk_t)(((xfs_off_t)(cookie) >> 32) & \ @@ -217,7 +217,7 @@ typedef struct xfs_dabuf { #endif struct xfs_buf *bps[1]; /* actually nbuf of these */ } xfs_dabuf_t; -#define XFS_DA_BUF_SIZE(n) \ +#define XFS_DA_BUF_SIZE(n) \ (sizeof(xfs_dabuf_t) + sizeof(struct xfs_buf *) * ((n) - 1)) #ifdef XFS_DABUF_DEBUG diff --git a/include/xfs_dfrag.h b/include/xfs_dfrag.h index 7143248ce..0e1c26fba 100644 --- a/include/xfs_dfrag.h +++ b/include/xfs_dfrag.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_DFRAG_H__ -#define __XFS_DFRAG_H__ +#define __XFS_DFRAG_H__ /* * Structure passed to xfs_swapext diff --git a/include/xfs_dinode.h b/include/xfs_dinode.h index 5adc2eabb..89bd040b4 100644 --- a/include/xfs_dinode.h +++ b/include/xfs_dinode.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,13 +30,13 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_DINODE_H__ -#define __XFS_DINODE_H__ +#define __XFS_DINODE_H__ struct xfs_buf; struct xfs_mount; -#define XFS_DINODE_VERSION_1 1 -#define XFS_DINODE_VERSION_2 2 +#define XFS_DINODE_VERSION_1 1 +#define XFS_DINODE_VERSION_2 2 #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DINODE_GOOD_VERSION) int xfs_dinode_good_version(int v); #define XFS_DINODE_GOOD_VERSION(v) xfs_dinode_good_version(v) @@ -44,7 +44,7 @@ int xfs_dinode_good_version(int v); #define XFS_DINODE_GOOD_VERSION(v) (((v) == XFS_DINODE_VERSION_1) || \ ((v) == XFS_DINODE_VERSION_2)) #endif -#define XFS_DINODE_MAGIC 0x494e /* 'IN' */ +#define XFS_DINODE_MAGIC 0x494e /* 'IN' */ /* * Disk inode structure. @@ -73,9 +73,9 @@ typedef struct xfs_dinode_core __uint32_t di_nlink; /* number of links to file */ __uint16_t di_projid; /* owner's project id */ __uint8_t di_pad[10]; /* unused, zeroed space */ - xfs_timestamp_t di_atime; /* time last accessed */ - xfs_timestamp_t di_mtime; /* time last modified */ - xfs_timestamp_t di_ctime; /* time created/inode modified */ + xfs_timestamp_t di_atime; /* time last accessed */ + xfs_timestamp_t di_mtime; /* time last modified */ + xfs_timestamp_t di_ctime; /* time created/inode modified */ xfs_fsize_t di_size; /* number of bytes in file */ xfs_drfsbno_t di_nblocks; /* # of direct & btree blocks used */ xfs_extlen_t di_extsize; /* basic/minimum extent size for file */ @@ -111,7 +111,7 @@ typedef struct xfs_dinode union { xfs_bmdr_block_t di_abmbt; /* btree root block */ xfs_bmbt_rec_32_t di_abmx[1]; /* extent list */ - xfs_attr_shortform_t di_attrsf; /* shortform attribute list */ + xfs_attr_shortform_t di_attrsf; /* shortform attribute list */ } di_a; } xfs_dinode_t; @@ -120,42 +120,42 @@ typedef struct xfs_dinode * Since the pathconf interface is signed, we use 2^31 - 1 instead. * The old inode format had a 16 bit link count, so its maximum is USHRT_MAX. */ -#define XFS_MAXLINK ((1U << 31) - 1U) -#define XFS_MAXLINK_1 65535U +#define XFS_MAXLINK ((1U << 31) - 1U) +#define XFS_MAXLINK_1 65535U /* * Bit names for logging disk inodes only */ -#define XFS_DI_MAGIC 0x0000001 -#define XFS_DI_MODE 0x0000002 -#define XFS_DI_VERSION 0x0000004 -#define XFS_DI_FORMAT 0x0000008 -#define XFS_DI_ONLINK 0x0000010 -#define XFS_DI_UID 0x0000020 -#define XFS_DI_GID 0x0000040 -#define XFS_DI_NLINK 0x0000080 -#define XFS_DI_PROJID 0x0000100 -#define XFS_DI_PAD 0x0000200 -#define XFS_DI_ATIME 0x0000400 -#define XFS_DI_MTIME 0x0000800 -#define XFS_DI_CTIME 0x0001000 -#define XFS_DI_SIZE 0x0002000 -#define XFS_DI_NBLOCKS 0x0004000 -#define XFS_DI_EXTSIZE 0x0008000 -#define XFS_DI_NEXTENTS 0x0010000 -#define XFS_DI_NAEXTENTS 0x0020000 -#define XFS_DI_FORKOFF 0x0040000 -#define XFS_DI_AFORMAT 0x0080000 -#define XFS_DI_DMEVMASK 0x0100000 -#define XFS_DI_DMSTATE 0x0200000 -#define XFS_DI_FLAGS 0x0400000 -#define XFS_DI_GEN 0x0800000 -#define XFS_DI_NEXT_UNLINKED 0x1000000 -#define XFS_DI_U 0x2000000 -#define XFS_DI_A 0x4000000 -#define XFS_DI_NUM_BITS 27 -#define XFS_DI_ALL_BITS ((1 << XFS_DI_NUM_BITS) - 1) -#define XFS_DI_CORE_BITS (XFS_DI_ALL_BITS & ~(XFS_DI_U|XFS_DI_A)) +#define XFS_DI_MAGIC 0x0000001 +#define XFS_DI_MODE 0x0000002 +#define XFS_DI_VERSION 0x0000004 +#define XFS_DI_FORMAT 0x0000008 +#define XFS_DI_ONLINK 0x0000010 +#define XFS_DI_UID 0x0000020 +#define XFS_DI_GID 0x0000040 +#define XFS_DI_NLINK 0x0000080 +#define XFS_DI_PROJID 0x0000100 +#define XFS_DI_PAD 0x0000200 +#define XFS_DI_ATIME 0x0000400 +#define XFS_DI_MTIME 0x0000800 +#define XFS_DI_CTIME 0x0001000 +#define XFS_DI_SIZE 0x0002000 +#define XFS_DI_NBLOCKS 0x0004000 +#define XFS_DI_EXTSIZE 0x0008000 +#define XFS_DI_NEXTENTS 0x0010000 +#define XFS_DI_NAEXTENTS 0x0020000 +#define XFS_DI_FORKOFF 0x0040000 +#define XFS_DI_AFORMAT 0x0080000 +#define XFS_DI_DMEVMASK 0x0100000 +#define XFS_DI_DMSTATE 0x0200000 +#define XFS_DI_FLAGS 0x0400000 +#define XFS_DI_GEN 0x0800000 +#define XFS_DI_NEXT_UNLINKED 0x1000000 +#define XFS_DI_U 0x2000000 +#define XFS_DI_A 0x4000000 +#define XFS_DI_NUM_BITS 27 +#define XFS_DI_ALL_BITS ((1 << XFS_DI_NUM_BITS) - 1) +#define XFS_DI_CORE_BITS (XFS_DI_ALL_BITS & ~(XFS_DI_U|XFS_DI_A)) /* * Values for di_format @@ -173,29 +173,29 @@ typedef enum xfs_dinode_fmt /* * Inode minimum and maximum sizes. */ -#define XFS_DINODE_MIN_LOG 8 -#define XFS_DINODE_MAX_LOG 11 -#define XFS_DINODE_MIN_SIZE (1 << XFS_DINODE_MIN_LOG) -#define XFS_DINODE_MAX_SIZE (1 << XFS_DINODE_MAX_LOG) +#define XFS_DINODE_MIN_LOG 8 +#define XFS_DINODE_MAX_LOG 11 +#define XFS_DINODE_MIN_SIZE (1 << XFS_DINODE_MIN_LOG) +#define XFS_DINODE_MAX_SIZE (1 << XFS_DINODE_MAX_LOG) /* * Inode size for given fs. */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_LITINO) int xfs_litino(struct xfs_mount *mp); -#define XFS_LITINO(mp) xfs_litino(mp) +#define XFS_LITINO(mp) xfs_litino(mp) #else -#define XFS_LITINO(mp) ((mp)->m_litino) +#define XFS_LITINO(mp) ((mp)->m_litino) #endif -#define XFS_BROOT_SIZE_ADJ \ +#define XFS_BROOT_SIZE_ADJ \ (sizeof(xfs_bmbt_block_t) - sizeof(xfs_bmdr_block_t)) /* * Fork identifiers. Here so utilities can use them without including * xfs_inode.h. */ -#define XFS_DATA_FORK 0 -#define XFS_ATTR_FORK 1 +#define XFS_DATA_FORK 0 +#define XFS_ATTR_FORK 1 /* * Inode data & attribute fork sizes, per inode. @@ -203,30 +203,30 @@ int xfs_litino(struct xfs_mount *mp); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_CFORK_Q) int xfs_cfork_q_arch(xfs_dinode_core_t *dcp, xfs_arch_t arch); int xfs_cfork_q(xfs_dinode_core_t *dcp); -#define XFS_CFORK_Q_ARCH(dcp,arch) xfs_cfork_q_arch(dcp,arch) -#define XFS_CFORK_Q(dcp) xfs_cfork_q(dcp) +#define XFS_CFORK_Q_ARCH(dcp,arch) xfs_cfork_q_arch(dcp,arch) +#define XFS_CFORK_Q(dcp) xfs_cfork_q(dcp) #else -#define XFS_CFORK_Q_ARCH(dcp,arch) (!INT_ISZERO((dcp)->di_forkoff, arch)) -#define XFS_CFORK_Q(dcp) ((dcp)->di_forkoff != 0) +#define XFS_CFORK_Q_ARCH(dcp,arch) (!INT_ISZERO((dcp)->di_forkoff, arch)) +#define XFS_CFORK_Q(dcp) ((dcp)->di_forkoff != 0) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_CFORK_BOFF) int xfs_cfork_boff_arch(xfs_dinode_core_t *dcp, xfs_arch_t arch); int xfs_cfork_boff(xfs_dinode_core_t *dcp); -#define XFS_CFORK_BOFF_ARCH(dcp,arch) xfs_cfork_boff_arch(dcp,arch) -#define XFS_CFORK_BOFF(dcp) xfs_cfork_boff(dcp) +#define XFS_CFORK_BOFF_ARCH(dcp,arch) xfs_cfork_boff_arch(dcp,arch) +#define XFS_CFORK_BOFF(dcp) xfs_cfork_boff(dcp) #else -#define XFS_CFORK_BOFF_ARCH(dcp,arch) ((int)(INT_GET((dcp)->di_forkoff, arch) << 3)) -#define XFS_CFORK_BOFF(dcp) ((int)((dcp)->di_forkoff << 3)) +#define XFS_CFORK_BOFF_ARCH(dcp,arch) ((int)(INT_GET((dcp)->di_forkoff, arch) << 3)) +#define XFS_CFORK_BOFF(dcp) ((int)((dcp)->di_forkoff << 3)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_CFORK_DSIZE) int xfs_cfork_dsize_arch(xfs_dinode_core_t *dcp, struct xfs_mount *mp, xfs_arch_t arch); int xfs_cfork_dsize(xfs_dinode_core_t *dcp, struct xfs_mount *mp); -#define XFS_CFORK_DSIZE_ARCH(dcp,mp,arch) xfs_cfork_dsize_arch(dcp,mp,arch) -#define XFS_CFORK_DSIZE(dcp,mp) xfs_cfork_dsize(dcp,mp) +#define XFS_CFORK_DSIZE_ARCH(dcp,mp,arch) xfs_cfork_dsize_arch(dcp,mp,arch) +#define XFS_CFORK_DSIZE(dcp,mp) xfs_cfork_dsize(dcp,mp) #else -#define XFS_CFORK_DSIZE_ARCH(dcp,mp,arch) \ +#define XFS_CFORK_DSIZE_ARCH(dcp,mp,arch) \ (XFS_CFORK_Q_ARCH(dcp, arch) ? XFS_CFORK_BOFF_ARCH(dcp, arch) : XFS_LITINO(mp)) #define XFS_CFORK_DSIZE(dcp,mp) \ (XFS_CFORK_Q(dcp) ? XFS_CFORK_BOFF(dcp) : XFS_LITINO(mp)) @@ -235,10 +235,10 @@ int xfs_cfork_dsize(xfs_dinode_core_t *dcp, struct xfs_mount *mp); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_CFORK_ASIZE) int xfs_cfork_asize_arch(xfs_dinode_core_t *dcp, struct xfs_mount *mp, xfs_arch_t arch); int xfs_cfork_asize(xfs_dinode_core_t *dcp, struct xfs_mount *mp); -#define XFS_CFORK_ASIZE_ARCH(dcp,mp,arch) xfs_cfork_asize_arch(dcp,mp,arch) -#define XFS_CFORK_ASIZE(dcp,mp) xfs_cfork_asize(dcp,mp) +#define XFS_CFORK_ASIZE_ARCH(dcp,mp,arch) xfs_cfork_asize_arch(dcp,mp,arch) +#define XFS_CFORK_ASIZE(dcp,mp) xfs_cfork_asize(dcp,mp) #else -#define XFS_CFORK_ASIZE_ARCH(dcp,mp,arch) \ +#define XFS_CFORK_ASIZE_ARCH(dcp,mp,arch) \ (XFS_CFORK_Q_ARCH(dcp, arch) ? XFS_LITINO(mp) - XFS_CFORK_BOFF_ARCH(dcp, arch) : 0) #define XFS_CFORK_ASIZE(dcp,mp) \ (XFS_CFORK_Q(dcp) ? XFS_LITINO(mp) - XFS_CFORK_BOFF(dcp) : 0) @@ -247,10 +247,10 @@ int xfs_cfork_asize(xfs_dinode_core_t *dcp, struct xfs_mount *mp); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_CFORK_SIZE) int xfs_cfork_size_arch(xfs_dinode_core_t *dcp, struct xfs_mount *mp, int w, xfs_arch_t arch); int xfs_cfork_size(xfs_dinode_core_t *dcp, struct xfs_mount *mp, int w); -#define XFS_CFORK_SIZE_ARCH(dcp,mp,w,arch) xfs_cfork_size_arch(dcp,mp,w,arch) -#define XFS_CFORK_SIZE(dcp,mp,w) xfs_cfork_size(dcp,mp,w) +#define XFS_CFORK_SIZE_ARCH(dcp,mp,w,arch) xfs_cfork_size_arch(dcp,mp,w,arch) +#define XFS_CFORK_SIZE(dcp,mp,w) xfs_cfork_size(dcp,mp,w) #else -#define XFS_CFORK_SIZE_ARCH(dcp,mp,w,arch) \ +#define XFS_CFORK_SIZE_ARCH(dcp,mp,w,arch) \ ((w) == XFS_DATA_FORK ? \ XFS_CFORK_DSIZE_ARCH(dcp, mp, arch) : XFS_CFORK_ASIZE_ARCH(dcp, mp, arch)) #define XFS_CFORK_SIZE(dcp,mp,w) \ @@ -262,31 +262,31 @@ int xfs_cfork_size(xfs_dinode_core_t *dcp, struct xfs_mount *mp, int w); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DFORK_DSIZE) int xfs_dfork_dsize_arch(xfs_dinode_t *dip, struct xfs_mount *mp, xfs_arch_t arch); int xfs_dfork_dsize(xfs_dinode_t *dip, struct xfs_mount *mp); -#define XFS_DFORK_DSIZE_ARCH(dip,mp,arch) xfs_dfork_dsize_arch(dip,mp,arch) -#define XFS_DFORK_DSIZE(dip,mp) xfs_dfork_dsize(dip,mp) +#define XFS_DFORK_DSIZE_ARCH(dip,mp,arch) xfs_dfork_dsize_arch(dip,mp,arch) +#define XFS_DFORK_DSIZE(dip,mp) xfs_dfork_dsize(dip,mp) #else -#define XFS_DFORK_DSIZE_ARCH(dip,mp,arch) XFS_CFORK_DSIZE_ARCH(&(dip)->di_core, mp, arch) -#define XFS_DFORK_DSIZE(dip,mp) XFS_DFORK_DSIZE_ARCH(dip,mp,ARCH_NOCONVERT) +#define XFS_DFORK_DSIZE_ARCH(dip,mp,arch) XFS_CFORK_DSIZE_ARCH(&(dip)->di_core, mp, arch) +#define XFS_DFORK_DSIZE(dip,mp) XFS_DFORK_DSIZE_ARCH(dip,mp,ARCH_NOCONVERT) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DFORK_ASIZE) int xfs_dfork_asize_arch(xfs_dinode_t *dip, struct xfs_mount *mp, xfs_arch_t arch); int xfs_dfork_asize(xfs_dinode_t *dip, struct xfs_mount *mp); -#define XFS_DFORK_ASIZE_ARCH(dip,mp,arch) xfs_dfork_asize_arch(dip,mp,arch) -#define XFS_DFORK_ASIZE(dip,mp) xfs_dfork_asize(dip,mp) +#define XFS_DFORK_ASIZE_ARCH(dip,mp,arch) xfs_dfork_asize_arch(dip,mp,arch) +#define XFS_DFORK_ASIZE(dip,mp) xfs_dfork_asize(dip,mp) #else -#define XFS_DFORK_ASIZE_ARCH(dip,mp,arch) XFS_CFORK_ASIZE_ARCH(&(dip)->di_core, mp, arch) -#define XFS_DFORK_ASIZE(dip,mp) XFS_DFORK_ASIZE_ARCH(dip,mp,ARCH_NOCONVERT) +#define XFS_DFORK_ASIZE_ARCH(dip,mp,arch) XFS_CFORK_ASIZE_ARCH(&(dip)->di_core, mp, arch) +#define XFS_DFORK_ASIZE(dip,mp) XFS_DFORK_ASIZE_ARCH(dip,mp,ARCH_NOCONVERT) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DFORK_SIZE) int xfs_dfork_size_arch(xfs_dinode_t *dip, struct xfs_mount *mp, int w, xfs_arch_t arch); int xfs_dfork_size(xfs_dinode_t *dip, struct xfs_mount *mp, int w); -#define XFS_DFORK_SIZE_ARCH(dip,mp,w,arch) xfs_dfork_size_arch(dip,mp,w,arch) -#define XFS_DFORK_SIZE(dip,mp,w) xfs_dfork_size(dip,mp,w) +#define XFS_DFORK_SIZE_ARCH(dip,mp,w,arch) xfs_dfork_size_arch(dip,mp,w,arch) +#define XFS_DFORK_SIZE(dip,mp,w) xfs_dfork_size(dip,mp,w) #else -#define XFS_DFORK_SIZE_ARCH(dip,mp,w,arch) XFS_CFORK_SIZE_ARCH(&(dip)->di_core, mp, w, arch) -#define XFS_DFORK_SIZE(dip,mp,w) XFS_DFORK_SIZE_ARCH(dip,mp,w,ARCH_NOCONVERT) +#define XFS_DFORK_SIZE_ARCH(dip,mp,w,arch) XFS_CFORK_SIZE_ARCH(&(dip)->di_core, mp, w, arch) +#define XFS_DFORK_SIZE(dip,mp,w) XFS_DFORK_SIZE_ARCH(dip,mp,w,ARCH_NOCONVERT) #endif @@ -296,171 +296,171 @@ int xfs_dfork_size(xfs_dinode_t *dip, struct xfs_mount *mp, int w); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DFORK_Q) int xfs_dfork_q_arch(xfs_dinode_t *dip, xfs_arch_t arch); int xfs_dfork_q(xfs_dinode_t *dip); -#define XFS_DFORK_Q_ARCH(dip,arch) xfs_dfork_q_arch(dip,arch) -#define XFS_DFORK_Q(dip) xfs_dfork_q(dip) +#define XFS_DFORK_Q_ARCH(dip,arch) xfs_dfork_q_arch(dip,arch) +#define XFS_DFORK_Q(dip) xfs_dfork_q(dip) #else -#define XFS_DFORK_Q_ARCH(dip,arch) XFS_CFORK_Q_ARCH(&(dip)->di_core, arch) -#define XFS_DFORK_Q(dip) XFS_DFORK_Q_ARCH(dip,ARCH_NOCONVERT) +#define XFS_DFORK_Q_ARCH(dip,arch) XFS_CFORK_Q_ARCH(&(dip)->di_core, arch) +#define XFS_DFORK_Q(dip) XFS_DFORK_Q_ARCH(dip,ARCH_NOCONVERT) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DFORK_BOFF) int xfs_dfork_boff_arch(xfs_dinode_t *dip, xfs_arch_t arch); int xfs_dfork_boff(xfs_dinode_t *dip); -#define XFS_DFORK_BOFF_ARCH(dip,arch) xfs_dfork_boff_arch(dip,arch) -#define XFS_DFORK_BOFF(dip) xfs_dfork_boff(dip) +#define XFS_DFORK_BOFF_ARCH(dip,arch) xfs_dfork_boff_arch(dip,arch) +#define XFS_DFORK_BOFF(dip) xfs_dfork_boff(dip) #else -#define XFS_DFORK_BOFF_ARCH(dip,arch) XFS_CFORK_BOFF_ARCH(&(dip)->di_core, arch) -#define XFS_DFORK_BOFF(dip) XFS_DFORK_BOFF_ARCH(dip,ARCH_NOCONVERT) +#define XFS_DFORK_BOFF_ARCH(dip,arch) XFS_CFORK_BOFF_ARCH(&(dip)->di_core, arch) +#define XFS_DFORK_BOFF(dip) XFS_DFORK_BOFF_ARCH(dip,ARCH_NOCONVERT) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DFORK_DPTR) char *xfs_dfork_dptr_arch(xfs_dinode_t *dip, xfs_arch_t arch); char *xfs_dfork_dptr(xfs_dinode_t *dip); -#define XFS_DFORK_DPTR_ARCH(dip,arch) xfs_dfork_dptr_arch(dip,arch) -#define XFS_DFORK_DPTR(dip) xfs_dfork_dptr(dip) +#define XFS_DFORK_DPTR_ARCH(dip,arch) xfs_dfork_dptr_arch(dip,arch) +#define XFS_DFORK_DPTR(dip) xfs_dfork_dptr(dip) #else -#define XFS_DFORK_DPTR_ARCH(dip,arch) ((dip)->di_u.di_c) -#define XFS_DFORK_DPTR(dip) XFS_DFORK_DPTR_ARCH(dip,ARCH_NOCONVERT) +#define XFS_DFORK_DPTR_ARCH(dip,arch) ((dip)->di_u.di_c) +#define XFS_DFORK_DPTR(dip) XFS_DFORK_DPTR_ARCH(dip,ARCH_NOCONVERT) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DFORK_APTR) char *xfs_dfork_aptr_arch(xfs_dinode_t *dip, xfs_arch_t arch); char *xfs_dfork_aptr(xfs_dinode_t *dip); -#define XFS_DFORK_APTR_ARCH(dip,arch) xfs_dfork_aptr_arch(dip,arch) -#define XFS_DFORK_APTR(dip) xfs_dfork_aptr(dip) +#define XFS_DFORK_APTR_ARCH(dip,arch) xfs_dfork_aptr_arch(dip,arch) +#define XFS_DFORK_APTR(dip) xfs_dfork_aptr(dip) #else -#define XFS_DFORK_APTR_ARCH(dip,arch) ((dip)->di_u.di_c + XFS_DFORK_BOFF_ARCH(dip, arch)) -#define XFS_DFORK_APTR(dip) XFS_DFORK_APTR_ARCH(dip,ARCH_NOCONVERT) +#define XFS_DFORK_APTR_ARCH(dip,arch) ((dip)->di_u.di_c + XFS_DFORK_BOFF_ARCH(dip, arch)) +#define XFS_DFORK_APTR(dip) XFS_DFORK_APTR_ARCH(dip,ARCH_NOCONVERT) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DFORK_PTR) char *xfs_dfork_ptr_arch(xfs_dinode_t *dip, int w, xfs_arch_t arch); char *xfs_dfork_ptr(xfs_dinode_t *dip, int w); -#define XFS_DFORK_PTR_ARCH(dip,w,arch) xfs_dfork_ptr_arch(dip,w,arch) -#define XFS_DFORK_PTR(dip,w) xfs_dfork_ptr(dip,w) +#define XFS_DFORK_PTR_ARCH(dip,w,arch) xfs_dfork_ptr_arch(dip,w,arch) +#define XFS_DFORK_PTR(dip,w) xfs_dfork_ptr(dip,w) #else -#define XFS_DFORK_PTR_ARCH(dip,w,arch) \ +#define XFS_DFORK_PTR_ARCH(dip,w,arch) \ ((w) == XFS_DATA_FORK ? XFS_DFORK_DPTR_ARCH(dip, arch) : XFS_DFORK_APTR_ARCH(dip, arch)) -#define XFS_DFORK_PTR(dip,w) XFS_DFORK_PTR_ARCH(dip,w,ARCH_NOCONVERT) +#define XFS_DFORK_PTR(dip,w) XFS_DFORK_PTR_ARCH(dip,w,ARCH_NOCONVERT) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_CFORK_FORMAT) int xfs_cfork_format_arch(xfs_dinode_core_t *dcp, int w, xfs_arch_t arch); int xfs_cfork_format(xfs_dinode_core_t *dcp, int w); -#define XFS_CFORK_FORMAT_ARCH(dcp,w,arch) xfs_cfork_format_arch(dcp,w,arch) -#define XFS_CFORK_FORMAT(dcp,w) xfs_cfork_format(dcp,w) +#define XFS_CFORK_FORMAT_ARCH(dcp,w,arch) xfs_cfork_format_arch(dcp,w,arch) +#define XFS_CFORK_FORMAT(dcp,w) xfs_cfork_format(dcp,w) #else -#define XFS_CFORK_FORMAT_ARCH(dcp,w,arch) \ +#define XFS_CFORK_FORMAT_ARCH(dcp,w,arch) \ ((w) == XFS_DATA_FORK ? INT_GET((dcp)->di_format, arch) : INT_GET((dcp)->di_aformat, arch)) -#define XFS_CFORK_FORMAT(dcp,w) XFS_CFORK_FORMAT_ARCH(dcp,w,ARCH_NOCONVERT) +#define XFS_CFORK_FORMAT(dcp,w) XFS_CFORK_FORMAT_ARCH(dcp,w,ARCH_NOCONVERT) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_CFORK_FMT_SET) void xfs_cfork_fmt_set_arch(xfs_dinode_core_t *dcp, int w, int n, xfs_arch_t arch); void xfs_cfork_fmt_set(xfs_dinode_core_t *dcp, int w, int n); -#define XFS_CFORK_FMT_SET_ARCH(dcp,w,n,arch) xfs_cfork_fmt_set_arch(dcp,w,n,arch) -#define XFS_CFORK_FMT_SET(dcp,w,n) xfs_cfork_fmt_set(dcp,w,n) +#define XFS_CFORK_FMT_SET_ARCH(dcp,w,n,arch) xfs_cfork_fmt_set_arch(dcp,w,n,arch) +#define XFS_CFORK_FMT_SET(dcp,w,n) xfs_cfork_fmt_set(dcp,w,n) #else -#define XFS_CFORK_FMT_SET_ARCH(dcp,w,n,arch) \ +#define XFS_CFORK_FMT_SET_ARCH(dcp,w,n,arch) \ ((w) == XFS_DATA_FORK ? \ (INT_SET((dcp)->di_format, arch, (n))) : \ (INT_SET((dcp)->di_aformat, arch, (n)))) -#define XFS_CFORK_FMT_SET(dcp,w,n) XFS_CFORK_FMT_SET_ARCH(dcp,w,n,ARCH_NOCONVERT) +#define XFS_CFORK_FMT_SET(dcp,w,n) XFS_CFORK_FMT_SET_ARCH(dcp,w,n,ARCH_NOCONVERT) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_CFORK_NEXTENTS) int xfs_cfork_nextents_arch(xfs_dinode_core_t *dcp, int w, xfs_arch_t arch); int xfs_cfork_nextents(xfs_dinode_core_t *dcp, int w); -#define XFS_CFORK_NEXTENTS_ARCH(dcp,w,arch) xfs_cfork_nextents_arch(dcp,w,arch) -#define XFS_CFORK_NEXTENTS(dcp,w) xfs_cfork_nextents(dcp,w) +#define XFS_CFORK_NEXTENTS_ARCH(dcp,w,arch) xfs_cfork_nextents_arch(dcp,w,arch) +#define XFS_CFORK_NEXTENTS(dcp,w) xfs_cfork_nextents(dcp,w) #else -#define XFS_CFORK_NEXTENTS_ARCH(dcp,w,arch) \ +#define XFS_CFORK_NEXTENTS_ARCH(dcp,w,arch) \ ((w) == XFS_DATA_FORK ? INT_GET((dcp)->di_nextents, arch) : INT_GET((dcp)->di_anextents, arch)) -#define XFS_CFORK_NEXTENTS(dcp,w) XFS_CFORK_NEXTENTS_ARCH(dcp,w,ARCH_NOCONVERT) +#define XFS_CFORK_NEXTENTS(dcp,w) XFS_CFORK_NEXTENTS_ARCH(dcp,w,ARCH_NOCONVERT) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_CFORK_NEXT_SET) void xfs_cfork_next_set_arch(xfs_dinode_core_t *dcp, int w, int n, xfs_arch_t arch); void xfs_cfork_next_set(xfs_dinode_core_t *dcp, int w, int n); -#define XFS_CFORK_NEXT_SET_ARCH(dcp,w,n,arch) xfs_cfork_next_set_arch(dcp,w,n,arch) -#define XFS_CFORK_NEXT_SET(dcp,w,n) xfs_cfork_next_set(dcp,w,n) +#define XFS_CFORK_NEXT_SET_ARCH(dcp,w,n,arch) xfs_cfork_next_set_arch(dcp,w,n,arch) +#define XFS_CFORK_NEXT_SET(dcp,w,n) xfs_cfork_next_set(dcp,w,n) #else -#define XFS_CFORK_NEXT_SET_ARCH(dcp,w,n,arch) \ +#define XFS_CFORK_NEXT_SET_ARCH(dcp,w,n,arch) \ ((w) == XFS_DATA_FORK ? \ (INT_SET((dcp)->di_nextents, arch, (n))) : \ (INT_SET((dcp)->di_anextents, arch, (n)))) -#define XFS_CFORK_NEXT_SET(dcp,w,n) XFS_CFORK_NEXT_SET_ARCH(dcp,w,n,ARCH_NOCONVERT) +#define XFS_CFORK_NEXT_SET(dcp,w,n) XFS_CFORK_NEXT_SET_ARCH(dcp,w,n,ARCH_NOCONVERT) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DFORK_FORMAT) int xfs_dfork_format_arch(xfs_dinode_t *dip, int w, xfs_arch_t arch); int xfs_dfork_format(xfs_dinode_t *dip, int w); -#define XFS_DFORK_FORMAT_ARCH(dip,w,arch) xfs_dfork_format_arch(dip,w,arch) -#define XFS_DFORK_FORMAT(dip,w) xfs_dfork_format(dip,w) +#define XFS_DFORK_FORMAT_ARCH(dip,w,arch) xfs_dfork_format_arch(dip,w,arch) +#define XFS_DFORK_FORMAT(dip,w) xfs_dfork_format(dip,w) #else -#define XFS_DFORK_FORMAT_ARCH(dip,w,arch) XFS_CFORK_FORMAT_ARCH(&(dip)->di_core, w, arch) -#define XFS_DFORK_FORMAT(dip,w) XFS_DFORK_FORMAT_ARCH(dip,w,ARCH_NOCONVERT) +#define XFS_DFORK_FORMAT_ARCH(dip,w,arch) XFS_CFORK_FORMAT_ARCH(&(dip)->di_core, w, arch) +#define XFS_DFORK_FORMAT(dip,w) XFS_DFORK_FORMAT_ARCH(dip,w,ARCH_NOCONVERT) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DFORK_FMT_SET) void xfs_dfork_fmt_set_arch(xfs_dinode_t *dip, int w, int n, xfs_arch_t arch); void xfs_dfork_fmt_set(xfs_dinode_t *dip, int w, int n); -#define XFS_DFORK_FMT_SET_ARCH(dip,w,n,arch) xfs_dfork_fmt_set_arch(dip,w,n,arch) -#define XFS_DFORK_FMT_SET(dip,w,n) xfs_dfork_fmt_set(dip,w,n) +#define XFS_DFORK_FMT_SET_ARCH(dip,w,n,arch) xfs_dfork_fmt_set_arch(dip,w,n,arch) +#define XFS_DFORK_FMT_SET(dip,w,n) xfs_dfork_fmt_set(dip,w,n) #else -#define XFS_DFORK_FMT_SET_ARCH(dip,w,n,arch) XFS_CFORK_FMT_SET_ARCH(&(dip)->di_core, w, n, arch) -#define XFS_DFORK_FMT_SET(dip,w,n) XFS_DFORK_FMT_SET_ARCH(dip,w,n,ARCH_NOCONVERT) +#define XFS_DFORK_FMT_SET_ARCH(dip,w,n,arch) XFS_CFORK_FMT_SET_ARCH(&(dip)->di_core, w, n, arch) +#define XFS_DFORK_FMT_SET(dip,w,n) XFS_DFORK_FMT_SET_ARCH(dip,w,n,ARCH_NOCONVERT) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DFORK_NEXTENTS) int xfs_dfork_nextents_arch(xfs_dinode_t *dip, int w, xfs_arch_t arch); int xfs_dfork_nextents(xfs_dinode_t *dip, int w); -#define XFS_DFORK_NEXTENTS_ARCH(dip,w,arch) xfs_dfork_nextents_arch(dip,w,arch) -#define XFS_DFORK_NEXTENTS(dip,w) xfs_dfork_nextents(dip,w) +#define XFS_DFORK_NEXTENTS_ARCH(dip,w,arch) xfs_dfork_nextents_arch(dip,w,arch) +#define XFS_DFORK_NEXTENTS(dip,w) xfs_dfork_nextents(dip,w) #else -#define XFS_DFORK_NEXTENTS_ARCH(dip,w,arch) XFS_CFORK_NEXTENTS_ARCH(&(dip)->di_core, w, arch) -#define XFS_DFORK_NEXTENTS(dip,w) XFS_DFORK_NEXTENTS_ARCH(dip,w,ARCH_NOCONVERT) +#define XFS_DFORK_NEXTENTS_ARCH(dip,w,arch) XFS_CFORK_NEXTENTS_ARCH(&(dip)->di_core, w, arch) +#define XFS_DFORK_NEXTENTS(dip,w) XFS_DFORK_NEXTENTS_ARCH(dip,w,ARCH_NOCONVERT) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DFORK_NEXT_SET) void xfs_dfork_next_set_arch(xfs_dinode_t *dip, int w, int n, xfs_arch_t arch); void xfs_dfork_next_set(xfs_dinode_t *dip, int w, int n); -#define XFS_DFORK_NEXT_SET_ARCH(dip,w,n,arch) xfs_dfork_next_set_arch(dip,w,n,arch) -#define XFS_DFORK_NEXT_SET(dip,w,n) xfs_dfork_next_set(dip,w,n) +#define XFS_DFORK_NEXT_SET_ARCH(dip,w,n,arch) xfs_dfork_next_set_arch(dip,w,n,arch) +#define XFS_DFORK_NEXT_SET(dip,w,n) xfs_dfork_next_set(dip,w,n) #else -#define XFS_DFORK_NEXT_SET_ARCH(dip,w,n,arch) XFS_CFORK_NEXT_SET_ARCH(&(dip)->di_core, w, n, arch) -#define XFS_DFORK_NEXT_SET(dip,w,n) XFS_DFORK_NEXT_SET_ARCH(dip,w,n,ARCH_NOCONVERT) +#define XFS_DFORK_NEXT_SET_ARCH(dip,w,n,arch) XFS_CFORK_NEXT_SET_ARCH(&(dip)->di_core, w, n, arch) +#define XFS_DFORK_NEXT_SET(dip,w,n) XFS_DFORK_NEXT_SET_ARCH(dip,w,n,ARCH_NOCONVERT) #endif /* * File types (mode field) */ -#define IFMT 0170000 /* type of file */ -#define IFIFO 0010000 /* named pipe (fifo) */ -#define IFCHR 0020000 /* character special */ -#define IFDIR 0040000 /* directory */ -#define IFBLK 0060000 /* block special */ -#define IFREG 0100000 /* regular */ -#define IFLNK 0120000 /* symbolic link */ -#define IFSOCK 0140000 /* socket */ -#define IFMNT 0160000 /* mount point */ +#define IFMT 0170000 /* type of file */ +#define IFIFO 0010000 /* named pipe (fifo) */ +#define IFCHR 0020000 /* character special */ +#define IFDIR 0040000 /* directory */ +#define IFBLK 0060000 /* block special */ +#define IFREG 0100000 /* regular */ +#define IFLNK 0120000 /* symbolic link */ +#define IFSOCK 0140000 /* socket */ +#define IFMNT 0160000 /* mount point */ /* * File execution and access modes. */ -#define ISUID 04000 /* set user id on execution */ -#define ISGID 02000 /* set group id on execution */ -#define ISVTX 01000 /* sticky directory */ -#define IREAD 0400 /* read, write, execute permissions */ -#define IWRITE 0200 -#define IEXEC 0100 +#define ISUID 04000 /* set user id on execution */ +#define ISGID 02000 /* set group id on execution */ +#define ISVTX 01000 /* sticky directory */ +#define IREAD 0400 /* read, write, execute permissions */ +#define IWRITE 0200 +#define IEXEC 0100 #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_BUF_TO_DINODE) xfs_dinode_t *xfs_buf_to_dinode(struct xfs_buf *bp); -#define XFS_BUF_TO_DINODE(bp) xfs_buf_to_dinode(bp) +#define XFS_BUF_TO_DINODE(bp) xfs_buf_to_dinode(bp) #else -#define XFS_BUF_TO_DINODE(bp) ((xfs_dinode_t *)(XFS_BUF_PTR(bp))) +#define XFS_BUF_TO_DINODE(bp) ((xfs_dinode_t *)(XFS_BUF_PTR(bp))) #endif /* @@ -468,13 +468,13 @@ xfs_dinode_t *xfs_buf_to_dinode(struct xfs_buf *bp); * There should be a one-to-one correspondence between these flags and the * XFS_XFLAG_s. */ -#define XFS_DIFLAG_REALTIME_BIT 0 /* file's blocks come from rt area */ -#define XFS_DIFLAG_PREALLOC_BIT 1 /* file space has been preallocated */ -#define XFS_DIFLAG_NEWRTBM_BIT 2 /* for rtbitmap inode, new format */ -#define XFS_DIFLAG_REALTIME (1 << XFS_DIFLAG_REALTIME_BIT) +#define XFS_DIFLAG_REALTIME_BIT 0 /* file's blocks come from rt area */ +#define XFS_DIFLAG_PREALLOC_BIT 1 /* file space has been preallocated */ +#define XFS_DIFLAG_NEWRTBM_BIT 2 /* for rtbitmap inode, new format */ +#define XFS_DIFLAG_REALTIME (1 << XFS_DIFLAG_REALTIME_BIT) #define XFS_DIFLAG_PREALLOC (1 << XFS_DIFLAG_PREALLOC_BIT) -#define XFS_DIFLAG_NEWRTBM (1 << XFS_DIFLAG_NEWRTBM_BIT) -#define XFS_DIFLAG_ALL \ +#define XFS_DIFLAG_NEWRTBM (1 << XFS_DIFLAG_NEWRTBM_BIT) +#define XFS_DIFLAG_ALL \ (XFS_DIFLAG_REALTIME|XFS_DIFLAG_PREALLOC|XFS_DIFLAG_NEWRTBM) #endif /* __XFS_DINODE_H__ */ diff --git a/include/xfs_dir.h b/include/xfs_dir.h index 73369f656..7c09e5c92 100644 --- a/include/xfs_dir.h +++ b/include/xfs_dir.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,13 +30,13 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_DIR_H__ -#define __XFS_DIR_H__ +#define __XFS_DIR_H__ /* * Large directories are structured around Btrees where all the data * elements are in the leaf nodes. Filenames are hashed into an int, * then that int is used as the index into the Btree. Since the hashval - * of a filename may not be unique, we may have duplicate keys. The + * of a filename may not be unique, we may have duplicate keys. The * internal links in the Btree are logical block offsets into the file. * * Small directories use a different format and are packed as tightly @@ -44,7 +44,7 @@ */ #ifdef XFS_ALL_TRACE -#define XFS_DIR_TRACE +#define XFS_DIR_TRACE #endif #if !defined(DEBUG) @@ -132,31 +132,31 @@ typedef struct xfs_dirops { */ void xfs_dir_startup(void); /* called exactly once */ -#define XFS_DIR_MOUNT(mp) \ +#define XFS_DIR_MOUNT(mp) \ ((mp)->m_dirops.xd_mount(mp)) -#define XFS_DIR_ISEMPTY(mp,dp) \ +#define XFS_DIR_ISEMPTY(mp,dp) \ ((mp)->m_dirops.xd_isempty(dp)) -#define XFS_DIR_INIT(mp,tp,dp,pdp) \ +#define XFS_DIR_INIT(mp,tp,dp,pdp) \ ((mp)->m_dirops.xd_init(tp,dp,pdp)) -#define XFS_DIR_CREATENAME(mp,tp,dp,name,namelen,inum,first,flist,total) \ +#define XFS_DIR_CREATENAME(mp,tp,dp,name,namelen,inum,first,flist,total) \ ((mp)->m_dirops.xd_createname(tp,dp,name,namelen,inum,first,flist,\ total)) -#define XFS_DIR_LOOKUP(mp,tp,dp,name,namelen,inum) \ +#define XFS_DIR_LOOKUP(mp,tp,dp,name,namelen,inum) \ ((mp)->m_dirops.xd_lookup(tp,dp,name,namelen,inum)) -#define XFS_DIR_REMOVENAME(mp,tp,dp,name,namelen,ino,first,flist,total) \ +#define XFS_DIR_REMOVENAME(mp,tp,dp,name,namelen,ino,first,flist,total) \ ((mp)->m_dirops.xd_removename(tp,dp,name,namelen,ino,first,flist,total)) -#define XFS_DIR_GETDENTS(mp,tp,dp,uio,eofp) \ +#define XFS_DIR_GETDENTS(mp,tp,dp,uio,eofp) \ ((mp)->m_dirops.xd_getdents(tp,dp,uio,eofp)) -#define XFS_DIR_REPLACE(mp,tp,dp,name,namelen,inum,first,flist,total) \ +#define XFS_DIR_REPLACE(mp,tp,dp,name,namelen,inum,first,flist,total) \ ((mp)->m_dirops.xd_replace(tp,dp,name,namelen,inum,first,flist,total)) -#define XFS_DIR_CANENTER(mp,tp,dp,name,namelen) \ +#define XFS_DIR_CANENTER(mp,tp,dp,name,namelen) \ ((mp)->m_dirops.xd_canenter(tp,dp,name,namelen)) -#define XFS_DIR_SHORTFORM_VALIDATE_ONDISK(mp,dip) \ +#define XFS_DIR_SHORTFORM_VALIDATE_ONDISK(mp,dip) \ ((mp)->m_dirops.xd_shortform_validate_ondisk(mp,dip)) -#define XFS_DIR_SHORTFORM_TO_SINGLE(mp,args) \ +#define XFS_DIR_SHORTFORM_TO_SINGLE(mp,args) \ ((mp)->m_dirops.xd_shortform_to_single(args)) -#define XFS_DIR_IS_V1(mp) ((mp)->m_dirversion == 1) +#define XFS_DIR_IS_V1(mp) ((mp)->m_dirversion == 1) extern xfs_dirops_t xfsv1_dirops; #endif /* __XFS_DIR_H__ */ diff --git a/include/xfs_dir2.h b/include/xfs_dir2.h index c129b7014..8f4fc7f23 100644 --- a/include/xfs_dir2.h +++ b/include/xfs_dir2.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_DIR2_H__ -#define __XFS_DIR2_H__ +#define __XFS_DIR2_H__ struct uio; struct xfs_dabuf; @@ -57,19 +57,19 @@ struct xfs_trans; /* * Byte offset in data block and shortform entry. */ -typedef __uint16_t xfs_dir2_data_off_t; -#define NULLDATAOFF 0xffffU +typedef __uint16_t xfs_dir2_data_off_t; +#define NULLDATAOFF 0xffffU typedef uint xfs_dir2_data_aoff_t; /* argument form */ /* * Directory block number (logical dirblk in file) */ -typedef __uint32_t xfs_dir2_db_t; +typedef __uint32_t xfs_dir2_db_t; /* * Byte offset in a directory. */ -typedef xfs_off_t xfs_dir2_off_t; +typedef xfs_off_t xfs_dir2_off_t; /* * For getdents, argument struct for put routines. @@ -86,7 +86,7 @@ typedef struct xfs_dir2_put_args { struct uio *uio; /* uio control structure */ } xfs_dir2_put_args_t; -#define XFS_DIR_IS_V2(mp) ((mp)->m_dirversion == 2) +#define XFS_DIR_IS_V2(mp) ((mp)->m_dirversion == 2) extern xfs_dirops_t xfsv2_dirops; /* diff --git a/include/xfs_dir2_block.h b/include/xfs_dir2_block.h index 64b9d06e4..3c4f70c91 100644 --- a/include/xfs_dir2_block.h +++ b/include/xfs_dir2_block.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_DIR2_BLOCK_H__ -#define __XFS_DIR2_BLOCK_H__ +#define __XFS_DIR2_BLOCK_H__ /* * xfs_dir2_block.h @@ -54,7 +54,7 @@ struct xfs_trans; * xfs_dir2_block_tail_t structure */ -#define XFS_DIR2_BLOCK_MAGIC 0x58443242 /* XD2B: for one block dirs */ +#define XFS_DIR2_BLOCK_MAGIC 0x58443242 /* XD2B: for one block dirs */ typedef struct xfs_dir2_block_tail { __uint32_t count; /* count of leaf entries */ @@ -77,9 +77,9 @@ typedef struct xfs_dir2_block { #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_BLOCK_TAIL_P) xfs_dir2_block_tail_t * xfs_dir2_block_tail_p(struct xfs_mount *mp, xfs_dir2_block_t *block); -#define XFS_DIR2_BLOCK_TAIL_P(mp,block) xfs_dir2_block_tail_p(mp,block) +#define XFS_DIR2_BLOCK_TAIL_P(mp,block) xfs_dir2_block_tail_p(mp,block) #else -#define XFS_DIR2_BLOCK_TAIL_P(mp,block) \ +#define XFS_DIR2_BLOCK_TAIL_P(mp,block) \ (((xfs_dir2_block_tail_t *)((char *)(block) + (mp)->m_dirblksize)) - 1) #endif @@ -89,10 +89,10 @@ xfs_dir2_block_tail_p(struct xfs_mount *mp, xfs_dir2_block_t *block); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_BLOCK_LEAF_P) struct xfs_dir2_leaf_entry *xfs_dir2_block_leaf_p_arch( xfs_dir2_block_tail_t *btp, xfs_arch_t arch); -#define XFS_DIR2_BLOCK_LEAF_P_ARCH(btp,arch) \ +#define XFS_DIR2_BLOCK_LEAF_P_ARCH(btp,arch) \ xfs_dir2_block_leaf_p_arch(btp,arch) #else -#define XFS_DIR2_BLOCK_LEAF_P_ARCH(btp,arch) \ +#define XFS_DIR2_BLOCK_LEAF_P_ARCH(btp,arch) \ (((struct xfs_dir2_leaf_entry *)(btp)) - INT_GET((btp)->count, arch)) #endif diff --git a/include/xfs_dir2_data.h b/include/xfs_dir2_data.h index 67236b271..b9e16ab5f 100644 --- a/include/xfs_dir2_data.h +++ b/include/xfs_dir2_data.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_DIR2_DATA_H__ -#define __XFS_DIR2_DATA_H__ +#define __XFS_DIR2_DATA_H__ /* * Directory format 2, data block structures. @@ -44,30 +44,30 @@ struct xfs_trans; /* * Constants. */ -#define XFS_DIR2_DATA_MAGIC 0x58443244 /* XD2D: for multiblock dirs */ -#define XFS_DIR2_DATA_ALIGN_LOG 3 /* i.e., 8 bytes */ -#define XFS_DIR2_DATA_ALIGN (1 << XFS_DIR2_DATA_ALIGN_LOG) -#define XFS_DIR2_DATA_FREE_TAG 0xffff -#define XFS_DIR2_DATA_FD_COUNT 3 +#define XFS_DIR2_DATA_MAGIC 0x58443244 /* XD2D: for multiblock dirs */ +#define XFS_DIR2_DATA_ALIGN_LOG 3 /* i.e., 8 bytes */ +#define XFS_DIR2_DATA_ALIGN (1 << XFS_DIR2_DATA_ALIGN_LOG) +#define XFS_DIR2_DATA_FREE_TAG 0xffff +#define XFS_DIR2_DATA_FD_COUNT 3 /* * Directory address space divided into sections, * spaces separated by 32gb. */ -#define XFS_DIR2_SPACE_SIZE (1ULL << (32 + XFS_DIR2_DATA_ALIGN_LOG)) -#define XFS_DIR2_DATA_SPACE 0 -#define XFS_DIR2_DATA_OFFSET (XFS_DIR2_DATA_SPACE * XFS_DIR2_SPACE_SIZE) -#define XFS_DIR2_DATA_FIRSTDB(mp) \ +#define XFS_DIR2_SPACE_SIZE (1ULL << (32 + XFS_DIR2_DATA_ALIGN_LOG)) +#define XFS_DIR2_DATA_SPACE 0 +#define XFS_DIR2_DATA_OFFSET (XFS_DIR2_DATA_SPACE * XFS_DIR2_SPACE_SIZE) +#define XFS_DIR2_DATA_FIRSTDB(mp) \ XFS_DIR2_BYTE_TO_DB(mp, XFS_DIR2_DATA_OFFSET) /* * Offsets of . and .. in data space (always block 0) */ -#define XFS_DIR2_DATA_DOT_OFFSET \ +#define XFS_DIR2_DATA_DOT_OFFSET \ ((xfs_dir2_data_aoff_t)sizeof(xfs_dir2_data_hdr_t)) -#define XFS_DIR2_DATA_DOTDOT_OFFSET \ +#define XFS_DIR2_DATA_DOTDOT_OFFSET \ (XFS_DIR2_DATA_DOT_OFFSET + XFS_DIR2_DATA_ENTSIZE(1)) -#define XFS_DIR2_DATA_FIRST_OFFSET \ +#define XFS_DIR2_DATA_FIRST_OFFSET \ (XFS_DIR2_DATA_DOTDOT_OFFSET + XFS_DIR2_DATA_ENTSIZE(2)) /* @@ -141,7 +141,7 @@ typedef struct xfs_dir2_data { int xfs_dir2_data_entsize(int n); #define XFS_DIR2_DATA_ENTSIZE(n) xfs_dir2_data_entsize(n) #else -#define XFS_DIR2_DATA_ENTSIZE(n) \ +#define XFS_DIR2_DATA_ENTSIZE(n) \ ((int)(roundup(offsetof(xfs_dir2_data_entry_t, name[0]) + (n) + \ (uint)sizeof(xfs_dir2_data_off_t), XFS_DIR2_DATA_ALIGN))) #endif @@ -151,9 +151,9 @@ int xfs_dir2_data_entsize(int n); */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_DATA_ENTRY_TAG_P) xfs_dir2_data_off_t *xfs_dir2_data_entry_tag_p(xfs_dir2_data_entry_t *dep); -#define XFS_DIR2_DATA_ENTRY_TAG_P(dep) xfs_dir2_data_entry_tag_p(dep) +#define XFS_DIR2_DATA_ENTRY_TAG_P(dep) xfs_dir2_data_entry_tag_p(dep) #else -#define XFS_DIR2_DATA_ENTRY_TAG_P(dep) \ +#define XFS_DIR2_DATA_ENTRY_TAG_P(dep) \ ((xfs_dir2_data_off_t *)\ ((char *)(dep) + XFS_DIR2_DATA_ENTSIZE((dep)->namelen) - \ (uint)sizeof(xfs_dir2_data_off_t))) @@ -165,10 +165,10 @@ xfs_dir2_data_off_t *xfs_dir2_data_entry_tag_p(xfs_dir2_data_entry_t *dep); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_DATA_UNUSED_TAG_P) xfs_dir2_data_off_t *xfs_dir2_data_unused_tag_p_arch( xfs_dir2_data_unused_t *dup, xfs_arch_t arch); -#define XFS_DIR2_DATA_UNUSED_TAG_P_ARCH(dup,arch) \ +#define XFS_DIR2_DATA_UNUSED_TAG_P_ARCH(dup,arch) \ xfs_dir2_data_unused_tag_p_arch(dup,arch) #else -#define XFS_DIR2_DATA_UNUSED_TAG_P_ARCH(dup,arch) \ +#define XFS_DIR2_DATA_UNUSED_TAG_P_ARCH(dup,arch) \ ((xfs_dir2_data_off_t *)\ ((char *)(dup) + INT_GET((dup)->length, arch) \ - (uint)sizeof(xfs_dir2_data_off_t))) @@ -182,7 +182,7 @@ xfs_dir2_data_off_t *xfs_dir2_data_unused_tag_p_arch( extern void xfs_dir2_data_check(struct xfs_inode *dp, struct xfs_dabuf *bp); #else -#define xfs_dir2_data_check(dp,bp) +#define xfs_dir2_data_check(dp,bp) #endif extern xfs_dir2_data_free_t * diff --git a/include/xfs_dir2_leaf.h b/include/xfs_dir2_leaf.h index 35549d967..1260ac51c 100644 --- a/include/xfs_dir2_leaf.h +++ b/include/xfs_dir2_leaf.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_DIR2_LEAF_H__ -#define __XFS_DIR2_LEAF_H__ +#define __XFS_DIR2_LEAF_H__ /* * Directory version 2, leaf block structures. @@ -51,9 +51,9 @@ struct xfs_trans; * Offset of the leaf/node space. First block in this space * is the btree root. */ -#define XFS_DIR2_LEAF_SPACE 1 -#define XFS_DIR2_LEAF_OFFSET (XFS_DIR2_LEAF_SPACE * XFS_DIR2_SPACE_SIZE) -#define XFS_DIR2_LEAF_FIRSTDB(mp) \ +#define XFS_DIR2_LEAF_SPACE 1 +#define XFS_DIR2_LEAF_OFFSET (XFS_DIR2_LEAF_SPACE * XFS_DIR2_SPACE_SIZE) +#define XFS_DIR2_LEAF_FIRSTDB(mp) \ XFS_DIR2_BYTE_TO_DB(mp, XFS_DIR2_LEAF_OFFSET) /* @@ -63,9 +63,9 @@ struct xfs_trans; /* * Offset in data space of a data entry. */ -typedef __uint32_t xfs_dir2_dataptr_t; -#define XFS_DIR2_MAX_DATAPTR ((xfs_dir2_dataptr_t)0x7fffffff) -#define XFS_DIR2_NULL_DATAPTR ((xfs_dir2_dataptr_t)0) +typedef __uint32_t xfs_dir2_dataptr_t; +#define XFS_DIR2_MAX_DATAPTR ((xfs_dir2_dataptr_t)0x7fffffff) +#define XFS_DIR2_NULL_DATAPTR ((xfs_dir2_dataptr_t)0) /* * Structures. @@ -116,10 +116,10 @@ typedef struct xfs_dir2_leaf { #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_MAX_LEAF_ENTS) int xfs_dir2_max_leaf_ents(struct xfs_mount *mp); -#define XFS_DIR2_MAX_LEAF_ENTS(mp) \ +#define XFS_DIR2_MAX_LEAF_ENTS(mp) \ xfs_dir2_max_leaf_ents(mp) #else -#define XFS_DIR2_MAX_LEAF_ENTS(mp) \ +#define XFS_DIR2_MAX_LEAF_ENTS(mp) \ ((int)(((mp)->m_dirblksize - (uint)sizeof(xfs_dir2_leaf_hdr_t)) / \ (uint)sizeof(xfs_dir2_leaf_entry_t))) #endif @@ -130,10 +130,10 @@ xfs_dir2_max_leaf_ents(struct xfs_mount *mp); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_LEAF_TAIL_P) xfs_dir2_leaf_tail_t * xfs_dir2_leaf_tail_p(struct xfs_mount *mp, xfs_dir2_leaf_t *lp); -#define XFS_DIR2_LEAF_TAIL_P(mp,lp) \ +#define XFS_DIR2_LEAF_TAIL_P(mp,lp) \ xfs_dir2_leaf_tail_p(mp, lp) #else -#define XFS_DIR2_LEAF_TAIL_P(mp,lp) \ +#define XFS_DIR2_LEAF_TAIL_P(mp,lp) \ ((xfs_dir2_leaf_tail_t *)\ ((char *)(lp) + (mp)->m_dirblksize - \ (uint)sizeof(xfs_dir2_leaf_tail_t))) @@ -145,9 +145,9 @@ xfs_dir2_leaf_tail_p(struct xfs_mount *mp, xfs_dir2_leaf_t *lp); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_LEAF_BESTS_P) xfs_dir2_data_off_t * xfs_dir2_leaf_bests_p_arch(xfs_dir2_leaf_tail_t *ltp, xfs_arch_t arch); -#define XFS_DIR2_LEAF_BESTS_P_ARCH(ltp,arch) xfs_dir2_leaf_bests_p_arch(ltp,arch) +#define XFS_DIR2_LEAF_BESTS_P_ARCH(ltp,arch) xfs_dir2_leaf_bests_p_arch(ltp,arch) #else -#define XFS_DIR2_LEAF_BESTS_P_ARCH(ltp,arch) \ +#define XFS_DIR2_LEAF_BESTS_P_ARCH(ltp,arch) \ ((xfs_dir2_data_off_t *)(ltp) - INT_GET((ltp)->bestcount, arch)) #endif @@ -157,9 +157,9 @@ xfs_dir2_leaf_bests_p_arch(xfs_dir2_leaf_tail_t *ltp, xfs_arch_t arch); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_DATAPTR_TO_BYTE) xfs_dir2_off_t xfs_dir2_dataptr_to_byte(struct xfs_mount *mp, xfs_dir2_dataptr_t dp); -#define XFS_DIR2_DATAPTR_TO_BYTE(mp,dp) xfs_dir2_dataptr_to_byte(mp, dp) +#define XFS_DIR2_DATAPTR_TO_BYTE(mp,dp) xfs_dir2_dataptr_to_byte(mp, dp) #else -#define XFS_DIR2_DATAPTR_TO_BYTE(mp,dp) \ +#define XFS_DIR2_DATAPTR_TO_BYTE(mp,dp) \ ((xfs_dir2_off_t)(dp) << XFS_DIR2_DATA_ALIGN_LOG) #endif @@ -169,9 +169,9 @@ xfs_dir2_dataptr_to_byte(struct xfs_mount *mp, xfs_dir2_dataptr_t dp); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_BYTE_TO_DATAPTR) xfs_dir2_dataptr_t xfs_dir2_byte_to_dataptr(struct xfs_mount *mp, xfs_dir2_off_t by); -#define XFS_DIR2_BYTE_TO_DATAPTR(mp,by) xfs_dir2_byte_to_dataptr(mp,by) +#define XFS_DIR2_BYTE_TO_DATAPTR(mp,by) xfs_dir2_byte_to_dataptr(mp,by) #else -#define XFS_DIR2_BYTE_TO_DATAPTR(mp,by) \ +#define XFS_DIR2_BYTE_TO_DATAPTR(mp,by) \ ((xfs_dir2_dataptr_t)((by) >> XFS_DIR2_DATA_ALIGN_LOG)) #endif @@ -181,9 +181,9 @@ xfs_dir2_byte_to_dataptr(struct xfs_mount *mp, xfs_dir2_off_t by); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_DATAPTR_TO_DB) xfs_dir2_db_t xfs_dir2_dataptr_to_db(struct xfs_mount *mp, xfs_dir2_dataptr_t dp); -#define XFS_DIR2_DATAPTR_TO_DB(mp,dp) xfs_dir2_dataptr_to_db(mp, dp) +#define XFS_DIR2_DATAPTR_TO_DB(mp,dp) xfs_dir2_dataptr_to_db(mp, dp) #else -#define XFS_DIR2_DATAPTR_TO_DB(mp,dp) \ +#define XFS_DIR2_DATAPTR_TO_DB(mp,dp) \ XFS_DIR2_BYTE_TO_DB(mp, XFS_DIR2_DATAPTR_TO_BYTE(mp, dp)) #endif @@ -193,9 +193,9 @@ xfs_dir2_dataptr_to_db(struct xfs_mount *mp, xfs_dir2_dataptr_t dp); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_DATAPTR_TO_OFF) xfs_dir2_data_aoff_t xfs_dir2_dataptr_to_off(struct xfs_mount *mp, xfs_dir2_dataptr_t dp); -#define XFS_DIR2_DATAPTR_TO_OFF(mp,dp) xfs_dir2_dataptr_to_off(mp, dp) +#define XFS_DIR2_DATAPTR_TO_OFF(mp,dp) xfs_dir2_dataptr_to_off(mp, dp) #else -#define XFS_DIR2_DATAPTR_TO_OFF(mp,dp) \ +#define XFS_DIR2_DATAPTR_TO_OFF(mp,dp) \ XFS_DIR2_BYTE_TO_OFF(mp, XFS_DIR2_DATAPTR_TO_BYTE(mp, dp)) #endif @@ -206,10 +206,10 @@ xfs_dir2_dataptr_to_off(struct xfs_mount *mp, xfs_dir2_dataptr_t dp); xfs_dir2_off_t xfs_dir2_db_off_to_byte(struct xfs_mount *mp, xfs_dir2_db_t db, xfs_dir2_data_aoff_t o); -#define XFS_DIR2_DB_OFF_TO_BYTE(mp,db,o) \ +#define XFS_DIR2_DB_OFF_TO_BYTE(mp,db,o) \ xfs_dir2_db_off_to_byte(mp, db, o) #else -#define XFS_DIR2_DB_OFF_TO_BYTE(mp,db,o) \ +#define XFS_DIR2_DB_OFF_TO_BYTE(mp,db,o) \ (((xfs_dir2_off_t)(db) << \ ((mp)->m_sb.sb_blocklog + (mp)->m_sb.sb_dirblklog)) + (o)) #endif @@ -219,9 +219,9 @@ xfs_dir2_db_off_to_byte(struct xfs_mount *mp, xfs_dir2_db_t db, */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_BYTE_TO_DB) xfs_dir2_db_t xfs_dir2_byte_to_db(struct xfs_mount *mp, xfs_dir2_off_t by); -#define XFS_DIR2_BYTE_TO_DB(mp,by) xfs_dir2_byte_to_db(mp, by) +#define XFS_DIR2_BYTE_TO_DB(mp,by) xfs_dir2_byte_to_db(mp, by) #else -#define XFS_DIR2_BYTE_TO_DB(mp,by) \ +#define XFS_DIR2_BYTE_TO_DB(mp,by) \ ((xfs_dir2_db_t)((by) >> \ ((mp)->m_sb.sb_blocklog + (mp)->m_sb.sb_dirblklog))) #endif @@ -231,9 +231,9 @@ xfs_dir2_db_t xfs_dir2_byte_to_db(struct xfs_mount *mp, xfs_dir2_off_t by); */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_BYTE_TO_DA) xfs_dablk_t xfs_dir2_byte_to_da(struct xfs_mount *mp, xfs_dir2_off_t by); -#define XFS_DIR2_BYTE_TO_DA(mp,by) xfs_dir2_byte_to_da(mp, by) +#define XFS_DIR2_BYTE_TO_DA(mp,by) xfs_dir2_byte_to_da(mp, by) #else -#define XFS_DIR2_BYTE_TO_DA(mp,by) \ +#define XFS_DIR2_BYTE_TO_DA(mp,by) \ XFS_DIR2_DB_TO_DA(mp, XFS_DIR2_BYTE_TO_DB(mp, by)) #endif @@ -243,9 +243,9 @@ xfs_dablk_t xfs_dir2_byte_to_da(struct xfs_mount *mp, xfs_dir2_off_t by); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_BYTE_TO_OFF) xfs_dir2_data_aoff_t xfs_dir2_byte_to_off(struct xfs_mount *mp, xfs_dir2_off_t by); -#define XFS_DIR2_BYTE_TO_OFF(mp,by) xfs_dir2_byte_to_off(mp, by) +#define XFS_DIR2_BYTE_TO_OFF(mp,by) xfs_dir2_byte_to_off(mp, by) #else -#define XFS_DIR2_BYTE_TO_OFF(mp,by) \ +#define XFS_DIR2_BYTE_TO_OFF(mp,by) \ ((xfs_dir2_data_aoff_t)((by) & \ ((1 << ((mp)->m_sb.sb_blocklog + \ (mp)->m_sb.sb_dirblklog)) - 1))) @@ -258,10 +258,10 @@ xfs_dir2_byte_to_off(struct xfs_mount *mp, xfs_dir2_off_t by); xfs_dir2_dataptr_t xfs_dir2_db_off_to_dataptr(struct xfs_mount *mp, xfs_dir2_db_t db, xfs_dir2_data_aoff_t o); -#define XFS_DIR2_DB_OFF_TO_DATAPTR(mp,db,o) \ +#define XFS_DIR2_DB_OFF_TO_DATAPTR(mp,db,o) \ xfs_dir2_db_off_to_dataptr(mp, db, o) #else -#define XFS_DIR2_DB_OFF_TO_DATAPTR(mp,db,o) \ +#define XFS_DIR2_DB_OFF_TO_DATAPTR(mp,db,o) \ XFS_DIR2_BYTE_TO_DATAPTR(mp, XFS_DIR2_DB_OFF_TO_BYTE(mp, db, o)) #endif @@ -270,9 +270,9 @@ xfs_dir2_db_off_to_dataptr(struct xfs_mount *mp, xfs_dir2_db_t db, */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_DB_TO_DA) xfs_dablk_t xfs_dir2_db_to_da(struct xfs_mount *mp, xfs_dir2_db_t db); -#define XFS_DIR2_DB_TO_DA(mp,db) xfs_dir2_db_to_da(mp, db) +#define XFS_DIR2_DB_TO_DA(mp,db) xfs_dir2_db_to_da(mp, db) #else -#define XFS_DIR2_DB_TO_DA(mp,db) \ +#define XFS_DIR2_DB_TO_DA(mp,db) \ ((xfs_dablk_t)((db) << (mp)->m_sb.sb_dirblklog)) #endif @@ -281,9 +281,9 @@ xfs_dablk_t xfs_dir2_db_to_da(struct xfs_mount *mp, xfs_dir2_db_t db); */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_DA_TO_DB) xfs_dir2_db_t xfs_dir2_da_to_db(struct xfs_mount *mp, xfs_dablk_t da); -#define XFS_DIR2_DA_TO_DB(mp,da) xfs_dir2_da_to_db(mp, da) +#define XFS_DIR2_DA_TO_DB(mp,da) xfs_dir2_da_to_db(mp, da) #else -#define XFS_DIR2_DA_TO_DB(mp,da) \ +#define XFS_DIR2_DA_TO_DB(mp,da) \ ((xfs_dir2_db_t)((da) >> (mp)->m_sb.sb_dirblklog)) #endif @@ -294,7 +294,7 @@ xfs_dir2_db_t xfs_dir2_da_to_db(struct xfs_mount *mp, xfs_dablk_t da); xfs_dir2_off_t xfs_dir2_da_to_byte(struct xfs_mount *mp, xfs_dablk_t da); #define XFS_DIR2_DA_TO_BYTE(mp,da) xfs_dir2_da_to_byte(mp, da) #else -#define XFS_DIR2_DA_TO_BYTE(mp,da) \ +#define XFS_DIR2_DA_TO_BYTE(mp,da) \ XFS_DIR2_DB_OFF_TO_BYTE(mp, XFS_DIR2_DA_TO_DB(mp, da), 0) #endif diff --git a/include/xfs_dir2_node.h b/include/xfs_dir2_node.h index af63d6a05..96db420c7 100644 --- a/include/xfs_dir2_node.h +++ b/include/xfs_dir2_node.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_DIR2_NODE_H__ -#define __XFS_DIR2_NODE_H__ +#define __XFS_DIR2_NODE_H__ /* * Directory version 2, btree node format structures @@ -51,17 +51,17 @@ struct xfs_trans; /* * Offset of the freespace index. */ -#define XFS_DIR2_FREE_SPACE 2 -#define XFS_DIR2_FREE_OFFSET (XFS_DIR2_FREE_SPACE * XFS_DIR2_SPACE_SIZE) -#define XFS_DIR2_FREE_FIRSTDB(mp) \ +#define XFS_DIR2_FREE_SPACE 2 +#define XFS_DIR2_FREE_OFFSET (XFS_DIR2_FREE_SPACE * XFS_DIR2_SPACE_SIZE) +#define XFS_DIR2_FREE_FIRSTDB(mp) \ XFS_DIR2_BYTE_TO_DB(mp, XFS_DIR2_FREE_OFFSET) -#define XFS_DIR2_FREE_MAGIC 0x58443246 /* XD2F */ +#define XFS_DIR2_FREE_MAGIC 0x58443246 /* XD2F */ /* * Structures. */ -typedef struct xfs_dir2_free_hdr { +typedef struct xfs_dir2_free_hdr { __uint32_t magic; /* XFS_DIR2_FREE_MAGIC */ __int32_t firstdb; /* db of first entry */ __int32_t nvalid; /* count of valid entries */ @@ -73,7 +73,7 @@ typedef struct xfs_dir2_free { xfs_dir2_data_off_t bests[1]; /* best free counts */ /* unused entries are -1 */ } xfs_dir2_free_t; -#define XFS_DIR2_MAX_FREE_BESTS(mp) \ +#define XFS_DIR2_MAX_FREE_BESTS(mp) \ (((mp)->m_dirblksize - (uint)sizeof(xfs_dir2_free_hdr_t)) / \ (uint)sizeof(xfs_dir2_data_off_t)) @@ -87,9 +87,9 @@ typedef struct xfs_dir2_free { #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_DB_TO_FDB) xfs_dir2_db_t xfs_dir2_db_to_fdb(struct xfs_mount *mp, xfs_dir2_db_t db); -#define XFS_DIR2_DB_TO_FDB(mp,db) xfs_dir2_db_to_fdb(mp, db) +#define XFS_DIR2_DB_TO_FDB(mp,db) xfs_dir2_db_to_fdb(mp, db) #else -#define XFS_DIR2_DB_TO_FDB(mp,db) \ +#define XFS_DIR2_DB_TO_FDB(mp,db) \ (XFS_DIR2_FREE_FIRSTDB(mp) + (db) / XFS_DIR2_MAX_FREE_BESTS(mp)) #endif @@ -99,9 +99,9 @@ xfs_dir2_db_to_fdb(struct xfs_mount *mp, xfs_dir2_db_t db); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_DB_TO_FDINDEX) int xfs_dir2_db_to_fdindex(struct xfs_mount *mp, xfs_dir2_db_t db); -#define XFS_DIR2_DB_TO_FDINDEX(mp,db) xfs_dir2_db_to_fdindex(mp, db) +#define XFS_DIR2_DB_TO_FDINDEX(mp,db) xfs_dir2_db_to_fdindex(mp, db) #else -#define XFS_DIR2_DB_TO_FDINDEX(mp,db) ((db) % XFS_DIR2_MAX_FREE_BESTS(mp)) +#define XFS_DIR2_DB_TO_FDINDEX(mp,db) ((db) % XFS_DIR2_MAX_FREE_BESTS(mp)) #endif /* diff --git a/include/xfs_dir2_sf.h b/include/xfs_dir2_sf.h index 4a9ef0567..3fea83ecd 100644 --- a/include/xfs_dir2_sf.h +++ b/include/xfs_dir2_sf.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_DIR2_SF_H__ -#define __XFS_DIR2_SF_H__ +#define __XFS_DIR2_SF_H__ /* * Directory layout when stored internal to an inode. @@ -50,18 +50,18 @@ struct xfs_trans; /* * Maximum size of a shortform directory. */ -#define XFS_DIR2_SF_MAX_SIZE \ +#define XFS_DIR2_SF_MAX_SIZE \ (XFS_DINODE_MAX_SIZE - (uint)sizeof(xfs_dinode_core_t) - \ (uint)sizeof(xfs_agino_t)) /* * Inode number stored as 8 8-bit values. */ -typedef struct { __uint8_t i[8]; } xfs_dir2_ino8_t; +typedef struct { __uint8_t i[8]; } xfs_dir2_ino8_t; -#define XFS_DIR2_SF_GET_INO8_ARCH(di,arch) \ +#define XFS_DIR2_SF_GET_INO8_ARCH(di,arch) \ (xfs_ino_t)(DIRINO_GET_ARCH(&di,arch)) -#define XFS_DIR2_SF_GET_INO8(di) \ +#define XFS_DIR2_SF_GET_INO8(di) \ XFS_DIR2_SF_GET_INO8_ARCH(di,ARCH_NOCONVERT) /* @@ -70,16 +70,16 @@ typedef struct { __uint8_t i[8]; } xfs_dir2_ino8_t; * fit in 32 bits. */ typedef struct { __uint8_t i[4]; } xfs_dir2_ino4_t; -#define XFS_DIR2_SF_GET_INO4_ARCH(di,arch) \ +#define XFS_DIR2_SF_GET_INO4_ARCH(di,arch) \ (xfs_ino_t)(DIRINO4_GET_ARCH(&di,arch)) -#define XFS_DIR2_SF_GET_INO4(di) \ +#define XFS_DIR2_SF_GET_INO4(di) \ XFS_DIR2_SF_GET_INO4_ARCH(di,ARCH_NOCONVERT) typedef union { - xfs_dir2_ino8_t i8; - xfs_dir2_ino4_t i4; + xfs_dir2_ino8_t i8; + xfs_dir2_ino4_t i4; } xfs_dir2_inou_t; -#define XFS_DIR2_MAX_SHORT_INUM ((xfs_ino_t)0xffffffffULL) +#define XFS_DIR2_MAX_SHORT_INUM ((xfs_ino_t)0xffffffffULL) /* * Normalized offset (in a data block) of the entry, really xfs_dir2_data_off_t. @@ -115,9 +115,9 @@ typedef struct xfs_dir2_sf { #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_SF_HDR_SIZE) int xfs_dir2_sf_hdr_size(int i8count); -#define XFS_DIR2_SF_HDR_SIZE(i8count) xfs_dir2_sf_hdr_size(i8count) +#define XFS_DIR2_SF_HDR_SIZE(i8count) xfs_dir2_sf_hdr_size(i8count) #else -#define XFS_DIR2_SF_HDR_SIZE(i8count) \ +#define XFS_DIR2_SF_HDR_SIZE(i8count) \ ((uint)sizeof(xfs_dir2_sf_hdr_t) - \ ((i8count) == 0) * \ ((uint)sizeof(xfs_dir2_ino8_t) - (uint)sizeof(xfs_dir2_ino4_t))) @@ -125,20 +125,20 @@ int xfs_dir2_sf_hdr_size(int i8count); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_SF_INUMBERP) xfs_dir2_inou_t *xfs_dir2_sf_inumberp(xfs_dir2_sf_entry_t *sfep); -#define XFS_DIR2_SF_INUMBERP(sfep) xfs_dir2_sf_inumberp(sfep) +#define XFS_DIR2_SF_INUMBERP(sfep) xfs_dir2_sf_inumberp(sfep) #else -#define XFS_DIR2_SF_INUMBERP(sfep) \ +#define XFS_DIR2_SF_INUMBERP(sfep) \ ((xfs_dir2_inou_t *)&(sfep)->name[(sfep)->namelen]) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_SF_GET_INUMBER) xfs_intino_t xfs_dir2_sf_get_inumber_arch(xfs_dir2_sf_t *sfp, xfs_dir2_inou_t *from, xfs_arch_t arch); -#define XFS_DIR2_SF_GET_INUMBER_ARCH(sfp, from, arch) \ +#define XFS_DIR2_SF_GET_INUMBER_ARCH(sfp, from, arch) \ xfs_dir2_sf_get_inumber_arch(sfp, from, arch) #else -#define XFS_DIR2_SF_GET_INUMBER_ARCH(sfp, from, arch) \ +#define XFS_DIR2_SF_GET_INUMBER_ARCH(sfp, from, arch) \ ((sfp)->hdr.i8count == 0 ? \ (xfs_intino_t)XFS_DIR2_SF_GET_INO4_ARCH(*(from), arch) : \ (xfs_intino_t)XFS_DIR2_SF_GET_INO8_ARCH(*(from), arch)) @@ -147,10 +147,10 @@ xfs_intino_t xfs_dir2_sf_get_inumber_arch(xfs_dir2_sf_t *sfp, xfs_dir2_inou_t *f #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_SF_PUT_INUMBER) void xfs_dir2_sf_put_inumber_arch(xfs_dir2_sf_t *sfp, xfs_ino_t *from, xfs_dir2_inou_t *to, xfs_arch_t arch); -#define XFS_DIR2_SF_PUT_INUMBER_ARCH(sfp,from,to,arch) \ +#define XFS_DIR2_SF_PUT_INUMBER_ARCH(sfp,from,to,arch) \ xfs_dir2_sf_put_inumber_arch(sfp,from,to,arch) #else -#define XFS_DIR2_SF_PUT_INUMBER_ARCH(sfp,from,to,arch) \ +#define XFS_DIR2_SF_PUT_INUMBER_ARCH(sfp,from,to,arch) \ if ((sfp)->hdr.i8count == 0) { \ DIRINO4_COPY_ARCH(from,to,arch); \ } else { \ @@ -162,20 +162,20 @@ void xfs_dir2_sf_put_inumber_arch(xfs_dir2_sf_t *sfp, xfs_ino_t *from, xfs_dir2_data_aoff_t xfs_dir2_sf_get_offset_arch(xfs_dir2_sf_entry_t *sfep, xfs_arch_t arch); xfs_dir2_data_aoff_t xfs_dir2_sf_get_offset(xfs_dir2_sf_entry_t *sfep); -#define XFS_DIR2_SF_GET_OFFSET_ARCH(sfep,arch) \ +#define XFS_DIR2_SF_GET_OFFSET_ARCH(sfep,arch) \ xfs_dir2_sf_get_offset_arch(sfep,arch) #else -#define XFS_DIR2_SF_GET_OFFSET_ARCH(sfep,arch) \ +#define XFS_DIR2_SF_GET_OFFSET_ARCH(sfep,arch) \ INT_GET_UNALIGNED_16_ARCH(&(sfep)->offset.i,arch) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_SF_PUT_OFFSET) void xfs_dir2_sf_put_offset_arch(xfs_dir2_sf_entry_t *sfep, xfs_dir2_data_aoff_t off, xfs_arch_t arch); -#define XFS_DIR2_SF_PUT_OFFSET_ARCH(sfep,off,arch) \ +#define XFS_DIR2_SF_PUT_OFFSET_ARCH(sfep,off,arch) \ xfs_dir2_sf_put_offset_arch(sfep,off,arch) #else -#define XFS_DIR2_SF_PUT_OFFSET_ARCH(sfep,off,arch) \ +#define XFS_DIR2_SF_PUT_OFFSET_ARCH(sfep,off,arch) \ INT_SET_UNALIGNED_16_ARCH(&(sfep)->offset.i,off,arch) #endif diff --git a/include/xfs_dir_leaf.h b/include/xfs_dir_leaf.h index ddcc9e065..ad7477401 100644 --- a/include/xfs_dir_leaf.h +++ b/include/xfs_dir_leaf.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_DIR_LEAF_H__ -#define __XFS_DIR_LEAF_H__ +#define __XFS_DIR_LEAF_H__ /* * Directory layout, internal structure, access macros, etc. @@ -38,7 +38,7 @@ * Large directories are structured around Btrees where all the data * elements are in the leaf nodes. Filenames are hashed into an int, * then that int is used as the index into the Btree. Since the hashval - * of a filename may not be unique, we may have duplicate keys. The + * of a filename may not be unique, we may have duplicate keys. The * internal links in the Btree are logical block offsets into the file. */ @@ -60,8 +60,8 @@ struct xfs_trans; /* * This is the structure of the leaf nodes in the Btree. * - * Struct leaf_entry's are packed from the top. Names grow from the bottom - * but are not packed. The freemap contains run-length-encoded entries + * Struct leaf_entry's are packed from the top. Names grow from the bottom + * but are not packed. The freemap contains run-length-encoded entries * for the free bytes after the leaf_entry's, but only the N largest such, * smaller runs are dropped. When the freemap doesn't show enough space * for an allocation, we compact the namelist area and try again. If we @@ -114,7 +114,7 @@ typedef struct xfs_dir_leaf_name xfs_dir_leaf_name_t; * Length of name for which a 512-byte block filesystem * can get a double split. */ -#define XFS_DIR_LEAF_CAN_DOUBLE_SPLIT_LEN \ +#define XFS_DIR_LEAF_CAN_DOUBLE_SPLIT_LEN \ (512 - (uint)sizeof(xfs_dir_leaf_hdr_t) - \ (uint)sizeof(xfs_dir_leaf_entry_t) * 2 - \ (uint)sizeof(xfs_dir_leaf_name_t) * 2 - (MAXNAMELEN - 2) + 1 + 1) @@ -137,12 +137,12 @@ typedef union { } s; } xfs_dircook_t; -#define XFS_PUT_COOKIE(c,mp,bno,entry,hash) \ +#define XFS_PUT_COOKIE(c,mp,bno,entry,hash) \ ((c).s.be = XFS_DA_MAKE_BNOENTRY(mp, bno, entry), (c).s.h = (hash)) -#define XFS_GET_DIR_INO_ARCH(mp,di,arch) \ +#define XFS_GET_DIR_INO_ARCH(mp,di,arch) \ DIRINO_GET_ARCH(&(di),arch) -#define XFS_GET_DIR_INO(mp,di) \ +#define XFS_GET_DIR_INO(mp,di) \ XFS_GET_DIR_INO_ARCH(mp,di,ARCH_NOCONVERT) typedef struct xfs_dir_put_args diff --git a/include/xfs_dir_sf.h b/include/xfs_dir_sf.h index 10c60645f..24b117a9c 100644 --- a/include/xfs_dir_sf.h +++ b/include/xfs_dir_sf.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_DIR_SF_H__ -#define __XFS_DIR_SF_H__ +#define __XFS_DIR_SF_H__ /* * Directory layout when stored internal to an inode. @@ -65,7 +65,7 @@ typedef struct xfs_dir_sf_entry xfs_dir_sf_entry_t; /* * We generate this then sort it, so that readdirs are returned in - * hash-order. Else seekdir won't work. + * hash-order. Else seekdir won't work. */ typedef struct xfs_dir_sf_sort { __uint8_t entno; /* .=0, ..=1, else entry# + 2 */ @@ -79,20 +79,20 @@ typedef struct xfs_dir_sf_sort { #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR_SF_GET_DIRINO) void xfs_dir_sf_get_dirino_arch(xfs_dir_ino_t *from, xfs_ino_t *to, xfs_arch_t arch); void xfs_dir_sf_get_dirino(xfs_dir_ino_t *from, xfs_ino_t *to); -#define XFS_DIR_SF_GET_DIRINO_ARCH(from,to,arch) xfs_dir_sf_get_dirino_arch(from, to, arch) -#define XFS_DIR_SF_GET_DIRINO(from,to) xfs_dir_sf_get_dirino(from, to) +#define XFS_DIR_SF_GET_DIRINO_ARCH(from,to,arch) xfs_dir_sf_get_dirino_arch(from, to, arch) +#define XFS_DIR_SF_GET_DIRINO(from,to) xfs_dir_sf_get_dirino(from, to) #else -#define XFS_DIR_SF_GET_DIRINO_ARCH(from,to,arch) DIRINO_COPY_ARCH(from,to,arch) -#define XFS_DIR_SF_GET_DIRINO(from,to) DIRINO_COPY_ARCH(from,to,ARCH_NOCONVERT) +#define XFS_DIR_SF_GET_DIRINO_ARCH(from,to,arch) DIRINO_COPY_ARCH(from,to,arch) +#define XFS_DIR_SF_GET_DIRINO(from,to) DIRINO_COPY_ARCH(from,to,ARCH_NOCONVERT) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR_SF_PUT_DIRINO) void xfs_dir_sf_put_dirino_arch(xfs_ino_t *from, xfs_dir_ino_t *to, xfs_arch_t arch); void xfs_dir_sf_put_dirino(xfs_ino_t *from, xfs_dir_ino_t *to); -#define XFS_DIR_SF_PUT_DIRINO_ARCH(from,to,arch) xfs_dir_sf_put_dirino_arch(from, to, arch) -#define XFS_DIR_SF_PUT_DIRINO(from,to) xfs_dir_sf_put_dirino(from, to) +#define XFS_DIR_SF_PUT_DIRINO_ARCH(from,to,arch) xfs_dir_sf_put_dirino_arch(from, to, arch) +#define XFS_DIR_SF_PUT_DIRINO(from,to) xfs_dir_sf_put_dirino(from, to) #else -#define XFS_DIR_SF_PUT_DIRINO_ARCH(from,to,arch) DIRINO_COPY_ARCH(from,to,arch) -#define XFS_DIR_SF_PUT_DIRINO(from,to) DIRINO_COPY_ARCH(from,to,ARCH_NOCONVERT) +#define XFS_DIR_SF_PUT_DIRINO_ARCH(from,to,arch) DIRINO_COPY_ARCH(from,to,arch) +#define XFS_DIR_SF_PUT_DIRINO(from,to) DIRINO_COPY_ARCH(from,to,ARCH_NOCONVERT) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR_SF_ENTSIZE_BYNAME) int xfs_dir_sf_entsize_byname(int len); @@ -127,7 +127,7 @@ int xfs_dir_sf_allfit(int count, int totallen); #endif #ifdef XFS_ALL_TRACE -#define XFS_DIR_TRACE +#define XFS_DIR_TRACE #endif #if !defined(DEBUG) @@ -144,17 +144,17 @@ struct xfs_dinode; struct xfs_dir_leafblock; struct xfs_dir_leaf_entry; -#define XFS_DIR_TRACE_SIZE 4096 /* size of global trace buffer */ +#define XFS_DIR_TRACE_SIZE 4096 /* size of global trace buffer */ /* * Trace record types. */ -#define XFS_DIR_KTRACE_G_DU 1 /* dp, uio */ -#define XFS_DIR_KTRACE_G_DUB 2 /* dp, uio, bno */ -#define XFS_DIR_KTRACE_G_DUN 3 /* dp, uio, node */ -#define XFS_DIR_KTRACE_G_DUL 4 /* dp, uio, leaf */ -#define XFS_DIR_KTRACE_G_DUE 5 /* dp, uio, leaf entry */ -#define XFS_DIR_KTRACE_G_DUC 6 /* dp, uio, cookie */ +#define XFS_DIR_KTRACE_G_DU 1 /* dp, uio */ +#define XFS_DIR_KTRACE_G_DUB 2 /* dp, uio, bno */ +#define XFS_DIR_KTRACE_G_DUN 3 /* dp, uio, node */ +#define XFS_DIR_KTRACE_G_DUL 4 /* dp, uio, leaf */ +#define XFS_DIR_KTRACE_G_DUE 5 /* dp, uio, leaf entry */ +#define XFS_DIR_KTRACE_G_DUC 6 /* dp, uio, cookie */ #if defined(XFS_DIR_TRACE) @@ -177,12 +177,12 @@ void xfs_dir_trace_enter(int type, char *where, __psunsigned_t a8, __psunsigned_t a9, __psunsigned_t a10, __psunsigned_t a11); #else -#define xfs_dir_trace_g_du(w,d,u) -#define xfs_dir_trace_g_dub(w,d,u,b) -#define xfs_dir_trace_g_dun(w,d,u,n) -#define xfs_dir_trace_g_dul(w,d,u,l) -#define xfs_dir_trace_g_due(w,d,u,e) -#define xfs_dir_trace_g_duc(w,d,u,c) +#define xfs_dir_trace_g_du(w,d,u) +#define xfs_dir_trace_g_dub(w,d,u,b) +#define xfs_dir_trace_g_dun(w,d,u,n) +#define xfs_dir_trace_g_dul(w,d,u,l) +#define xfs_dir_trace_g_due(w,d,u,e) +#define xfs_dir_trace_g_duc(w,d,u,c) #endif /* DEBUG */ #endif /* __XFS_DIR_SF_H__ */ diff --git a/include/xfs_extfree_item.h b/include/xfs_extfree_item.h index d3bf293c2..7122d6101 100644 --- a/include/xfs_extfree_item.h +++ b/include/xfs_extfree_item.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -29,8 +29,8 @@ * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ -#ifndef __XFS_EXTFREE_ITEM_H__ -#define __XFS_EXTFREE_ITEM_H__ +#ifndef __XFS_EXTFREE_ITEM_H__ +#define __XFS_EXTFREE_ITEM_H__ struct xfs_mount; struct kmem_zone; @@ -42,7 +42,7 @@ typedef struct xfs_extent { /* * This is the structure used to lay out an efi log item in the - * log. The efi_extents field is a variable size array whose + * log. The efi_extents field is a variable size array whose * size is given by efi_nextents. */ typedef struct xfs_efi_log_format { @@ -50,12 +50,12 @@ typedef struct xfs_efi_log_format { unsigned short efi_size; /* size of this item */ uint efi_nextents; /* # extents to free */ __uint64_t efi_id; /* efi identifier */ - xfs_extent_t efi_extents[1]; /* array of extents to free */ + xfs_extent_t efi_extents[1]; /* array of extents to free */ } xfs_efi_log_format_t; /* * This is the structure used to lay out an efd log item in the - * log. The efd_extents array is a variable size array whose + * log. The efd_extents array is a variable size array whose * size is given by efd_nextents; */ typedef struct xfs_efd_log_format { @@ -63,7 +63,7 @@ typedef struct xfs_efd_log_format { unsigned short efd_size; /* size of this item */ uint efd_nextents; /* # of extents freed */ __uint64_t efd_efi_id; /* id of corresponding efi */ - xfs_extent_t efd_extents[1]; /* array of extents freed */ + xfs_extent_t efd_extents[1]; /* array of extents freed */ } xfs_efd_log_format_t; @@ -72,14 +72,14 @@ typedef struct xfs_efd_log_format { /* * Max number of extents in fast allocation path. */ -#define XFS_EFI_MAX_FAST_EXTENTS 16 +#define XFS_EFI_MAX_FAST_EXTENTS 16 /* * Define EFI flags. */ -#define XFS_EFI_RECOVERED 0x1 -#define XFS_EFI_COMMITTED 0x2 -#define XFS_EFI_CANCELED 0x4 +#define XFS_EFI_RECOVERED 0x1 +#define XFS_EFI_COMMITTED 0x2 +#define XFS_EFI_CANCELED 0x4 /* * This is the "extent free intention" log item. It is used @@ -109,7 +109,7 @@ typedef struct xfs_efd_log_item { /* * Max number of extents in fast allocation path. */ -#define XFS_EFD_MAX_FAST_EXTENTS 16 +#define XFS_EFD_MAX_FAST_EXTENTS 16 extern struct kmem_zone *xfs_efi_zone; extern struct kmem_zone *xfs_efd_zone; diff --git a/include/xfs_ialloc.h b/include/xfs_ialloc.h index bc88dd9c7..20b38c8cd 100644 --- a/include/xfs_ialloc.h +++ b/include/xfs_ialloc.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_IALLOC_H__ -#define __XFS_IALLOC_H__ +#define __XFS_IALLOC_H__ struct xfs_buf; struct xfs_dinode; @@ -42,15 +42,15 @@ struct xfs_trans; */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_IALLOC_INODES) int xfs_ialloc_inodes(struct xfs_mount *mp); -#define XFS_IALLOC_INODES(mp) xfs_ialloc_inodes(mp) +#define XFS_IALLOC_INODES(mp) xfs_ialloc_inodes(mp) #else -#define XFS_IALLOC_INODES(mp) ((mp)->m_ialloc_inos) +#define XFS_IALLOC_INODES(mp) ((mp)->m_ialloc_inos) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_IALLOC_BLOCKS) xfs_extlen_t xfs_ialloc_blocks(struct xfs_mount *mp); -#define XFS_IALLOC_BLOCKS(mp) xfs_ialloc_blocks(mp) +#define XFS_IALLOC_BLOCKS(mp) xfs_ialloc_blocks(mp) #else -#define XFS_IALLOC_BLOCKS(mp) ((mp)->m_ialloc_blks) +#define XFS_IALLOC_BLOCKS(mp) ((mp)->m_ialloc_blks) #endif /* @@ -60,18 +60,18 @@ xfs_extlen_t xfs_ialloc_blocks(struct xfs_mount *mp); * around for xfs_dilocate(). We choose which one to use in * xfs_mount_int(). */ -#define XFS_INODE_BIG_CLUSTER_SIZE 8192 -#define XFS_INODE_SMALL_CLUSTER_SIZE 4096 -#define XFS_INODE_CLUSTER_SIZE(mp) (mp)->m_inode_cluster_size +#define XFS_INODE_BIG_CLUSTER_SIZE 8192 +#define XFS_INODE_SMALL_CLUSTER_SIZE 4096 +#define XFS_INODE_CLUSTER_SIZE(mp) (mp)->m_inode_cluster_size /* * Make an inode pointer out of the buffer/offset. */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_MAKE_IPTR) struct xfs_dinode *xfs_make_iptr(struct xfs_mount *mp, struct xfs_buf *b, int o); -#define XFS_MAKE_IPTR(mp,b,o) xfs_make_iptr(mp,b,o) +#define XFS_MAKE_IPTR(mp,b,o) xfs_make_iptr(mp,b,o) #else -#define XFS_MAKE_IPTR(mp,b,o) \ +#define XFS_MAKE_IPTR(mp,b,o) \ ((xfs_dinode_t *)(xfs_buf_offset(b, (o) << (mp)->m_sb.sb_inodelog))) #endif @@ -80,9 +80,9 @@ struct xfs_dinode *xfs_make_iptr(struct xfs_mount *mp, struct xfs_buf *b, int o) */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_IALLOC_FIND_FREE) int xfs_ialloc_find_free(xfs_inofree_t *fp); -#define XFS_IALLOC_FIND_FREE(fp) xfs_ialloc_find_free(fp) +#define XFS_IALLOC_FIND_FREE(fp) xfs_ialloc_find_free(fp) #else -#define XFS_IALLOC_FIND_FREE(fp) xfs_lowbit64(*(fp)) +#define XFS_IALLOC_FIND_FREE(fp) xfs_lowbit64(*(fp)) #endif @@ -99,17 +99,17 @@ int xfs_ialloc_find_free(xfs_inofree_t *fp); * * To work within the constraint of one allocation per transaction, * xfs_dialloc() is designed to be called twice if it has to do an - * allocation to make more free inodes. If an inode is + * allocation to make more free inodes. If an inode is * available without an allocation, agbp would be set to the current * agbp and alloc_done set to false. * If an allocation needed to be done, agbp would be set to the * inode header of the allocation group and alloc_done set to true. * The caller should then commit the current transaction and allocate a new - * transaction. xfs_dialloc() should then be called again with + * transaction. xfs_dialloc() should then be called again with * the agbp value returned from the previous call. * * Once we successfully pick an inode its number is returned and the - * on-disk data structures are updated. The inode itself is not read + * on-disk data structures are updated. The inode itself is not read * in, since doing so would break ordering constraints with xfs_reclaim. * * *agbp should be set to NULL on the first call, *alloc_done set to FALSE. diff --git a/include/xfs_ialloc_btree.h b/include/xfs_ialloc_btree.h index fd27bc62b..c02586a14 100644 --- a/include/xfs_ialloc_btree.h +++ b/include/xfs_ialloc_btree.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_IALLOC_BTREE_H__ -#define __XFS_IALLOC_BTREE_H__ +#define __XFS_IALLOC_BTREE_H__ /* * Inode map on-disk structures @@ -44,18 +44,18 @@ struct xfs_mount; /* * There is a btree for the inode map per allocation group. */ -#define XFS_IBT_MAGIC 0x49414254 /* 'IABT' */ +#define XFS_IBT_MAGIC 0x49414254 /* 'IABT' */ -typedef __uint64_t xfs_inofree_t; -#define XFS_INODES_PER_CHUNK (NBBY * sizeof(xfs_inofree_t)) -#define XFS_INODES_PER_CHUNK_LOG (XFS_NBBYLOG + 3) -#define XFS_INOBT_ALL_FREE ((xfs_inofree_t)-1) +typedef __uint64_t xfs_inofree_t; +#define XFS_INODES_PER_CHUNK (NBBY * sizeof(xfs_inofree_t)) +#define XFS_INODES_PER_CHUNK_LOG (XFS_NBBYLOG + 3) +#define XFS_INOBT_ALL_FREE ((xfs_inofree_t)-1) #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INOBT_MASKN) xfs_inofree_t xfs_inobt_maskn(int i, int n); -#define XFS_INOBT_MASKN(i,n) xfs_inobt_maskn(i,n) +#define XFS_INOBT_MASKN(i,n) xfs_inobt_maskn(i,n) #else -#define XFS_INOBT_MASKN(i,n) \ +#define XFS_INOBT_MASKN(i,n) \ ((((n) >= XFS_INODES_PER_CHUNK ? \ (xfs_inofree_t)0 : ((xfs_inofree_t)1 << (n))) - 1) << (i)) #endif @@ -80,13 +80,13 @@ typedef struct xfs_inobt_key typedef xfs_agblock_t xfs_inobt_ptr_t; /* btree pointer type */ /* btree block header type */ -typedef struct xfs_btree_sblock xfs_inobt_block_t; +typedef struct xfs_btree_sblock xfs_inobt_block_t; #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_BUF_TO_INOBT_BLOCK) xfs_inobt_block_t *xfs_buf_to_inobt_block(struct xfs_buf *bp); -#define XFS_BUF_TO_INOBT_BLOCK(bp) xfs_buf_to_inobt_block(bp) +#define XFS_BUF_TO_INOBT_BLOCK(bp) xfs_buf_to_inobt_block(bp) #else -#define XFS_BUF_TO_INOBT_BLOCK(bp) ((xfs_inobt_block_t *)(XFS_BUF_PTR(bp))) +#define XFS_BUF_TO_INOBT_BLOCK(bp) ((xfs_inobt_block_t *)(XFS_BUF_PTR(bp))) #endif /* @@ -94,28 +94,28 @@ xfs_inobt_block_t *xfs_buf_to_inobt_block(struct xfs_buf *bp); */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INOBT_MASK) xfs_inofree_t xfs_inobt_mask(int i); -#define XFS_INOBT_MASK(i) xfs_inobt_mask(i) +#define XFS_INOBT_MASK(i) xfs_inobt_mask(i) #else -#define XFS_INOBT_MASK(i) ((xfs_inofree_t)1 << (i)) +#define XFS_INOBT_MASK(i) ((xfs_inofree_t)1 << (i)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INOBT_IS_FREE) int xfs_inobt_is_free(xfs_inobt_rec_t *rp, int i, xfs_arch_t arch); -#define XFS_INOBT_IS_FREE(rp,i,arch) xfs_inobt_is_free(rp,i,arch) +#define XFS_INOBT_IS_FREE(rp,i,arch) xfs_inobt_is_free(rp,i,arch) #else -#define XFS_INOBT_IS_FREE(rp,i,arch) ((INT_GET((rp)->ir_free, arch) \ +#define XFS_INOBT_IS_FREE(rp,i,arch) ((INT_GET((rp)->ir_free, arch) \ & XFS_INOBT_MASK(i)) != 0) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INOBT_SET_FREE) void xfs_inobt_set_free(xfs_inobt_rec_t *rp, int i, xfs_arch_t arch); -#define XFS_INOBT_SET_FREE(rp,i,arch) xfs_inobt_set_free(rp,i,arch) +#define XFS_INOBT_SET_FREE(rp,i,arch) xfs_inobt_set_free(rp,i,arch) #else -#define XFS_INOBT_SET_FREE(rp,i,arch) (INT_MOD_EXPR((rp)->ir_free, arch, |= XFS_INOBT_MASK(i))) +#define XFS_INOBT_SET_FREE(rp,i,arch) (INT_MOD_EXPR((rp)->ir_free, arch, |= XFS_INOBT_MASK(i))) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INOBT_CLR_FREE) void xfs_inobt_clr_free(xfs_inobt_rec_t *rp, int i, xfs_arch_t arch); -#define XFS_INOBT_CLR_FREE(rp,i,arch) xfs_inobt_clr_free(rp,i,arch) +#define XFS_INOBT_CLR_FREE(rp,i,arch) xfs_inobt_clr_free(rp,i,arch) #else -#define XFS_INOBT_CLR_FREE(rp,i,arch) (INT_MOD_EXPR((rp)->ir_free, arch, &= ~XFS_INOBT_MASK(i))) +#define XFS_INOBT_CLR_FREE(rp,i,arch) (INT_MOD_EXPR((rp)->ir_free, arch, &= ~XFS_INOBT_MASK(i))) #endif /* @@ -123,31 +123,31 @@ void xfs_inobt_clr_free(xfs_inobt_rec_t *rp, int i, xfs_arch_t arch); */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INOBT_BLOCK_SIZE) int xfs_inobt_block_size(int lev, struct xfs_btree_cur *cur); -#define XFS_INOBT_BLOCK_SIZE(lev,cur) xfs_inobt_block_size(lev,cur) +#define XFS_INOBT_BLOCK_SIZE(lev,cur) xfs_inobt_block_size(lev,cur) #else -#define XFS_INOBT_BLOCK_SIZE(lev,cur) (1 << (cur)->bc_blocklog) +#define XFS_INOBT_BLOCK_SIZE(lev,cur) (1 << (cur)->bc_blocklog) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INOBT_BLOCK_MAXRECS) int xfs_inobt_block_maxrecs(int lev, struct xfs_btree_cur *cur); -#define XFS_INOBT_BLOCK_MAXRECS(lev,cur) xfs_inobt_block_maxrecs(lev,cur) +#define XFS_INOBT_BLOCK_MAXRECS(lev,cur) xfs_inobt_block_maxrecs(lev,cur) #else -#define XFS_INOBT_BLOCK_MAXRECS(lev,cur) \ +#define XFS_INOBT_BLOCK_MAXRECS(lev,cur) \ ((cur)->bc_mp->m_inobt_mxr[lev != 0]) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INOBT_BLOCK_MINRECS) int xfs_inobt_block_minrecs(int lev, struct xfs_btree_cur *cur); -#define XFS_INOBT_BLOCK_MINRECS(lev,cur) xfs_inobt_block_minrecs(lev,cur) +#define XFS_INOBT_BLOCK_MINRECS(lev,cur) xfs_inobt_block_minrecs(lev,cur) #else -#define XFS_INOBT_BLOCK_MINRECS(lev,cur) \ +#define XFS_INOBT_BLOCK_MINRECS(lev,cur) \ ((cur)->bc_mp->m_inobt_mnr[lev != 0]) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INOBT_IS_LAST_REC) int xfs_inobt_is_last_rec(struct xfs_btree_cur *cur); -#define XFS_INOBT_IS_LAST_REC(cur) xfs_inobt_is_last_rec(cur) +#define XFS_INOBT_IS_LAST_REC(cur) xfs_inobt_is_last_rec(cur) #else -#define XFS_INOBT_IS_LAST_REC(cur) \ +#define XFS_INOBT_IS_LAST_REC(cur) \ ((cur)->bc_ptrs[0] == \ INT_GET(XFS_BUF_TO_INOBT_BLOCK((cur)->bc_bufs[0])->bb_numrecs, ARCH_CONVERT)) #endif @@ -157,9 +157,9 @@ int xfs_inobt_is_last_rec(struct xfs_btree_cur *cur); */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_IN_MAXLEVELS) int xfs_in_maxlevels(struct xfs_mount *mp); -#define XFS_IN_MAXLEVELS(mp) xfs_in_maxlevels(mp) +#define XFS_IN_MAXLEVELS(mp) xfs_in_maxlevels(mp) #else -#define XFS_IN_MAXLEVELS(mp) ((mp)->m_in_maxlevels) +#define XFS_IN_MAXLEVELS(mp) ((mp)->m_in_maxlevels) #endif /* @@ -167,15 +167,15 @@ int xfs_in_maxlevels(struct xfs_mount *mp); */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_IBT_BLOCK) xfs_agblock_t xfs_ibt_block(struct xfs_mount *mp); -#define XFS_IBT_BLOCK(mp) xfs_ibt_block(mp) +#define XFS_IBT_BLOCK(mp) xfs_ibt_block(mp) #else -#define XFS_IBT_BLOCK(mp) ((xfs_agblock_t)(XFS_CNT_BLOCK(mp) + 1)) +#define XFS_IBT_BLOCK(mp) ((xfs_agblock_t)(XFS_CNT_BLOCK(mp) + 1)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_PREALLOC_BLOCKS) xfs_agblock_t xfs_prealloc_blocks(struct xfs_mount *mp); -#define XFS_PREALLOC_BLOCKS(mp) xfs_prealloc_blocks(mp) +#define XFS_PREALLOC_BLOCKS(mp) xfs_prealloc_blocks(mp) #else -#define XFS_PREALLOC_BLOCKS(mp) ((xfs_agblock_t)(XFS_IBT_BLOCK(mp) + 1)) +#define XFS_PREALLOC_BLOCKS(mp) ((xfs_agblock_t)(XFS_IBT_BLOCK(mp) + 1)) #endif /* @@ -184,9 +184,9 @@ xfs_agblock_t xfs_prealloc_blocks(struct xfs_mount *mp); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INOBT_REC_ADDR) xfs_inobt_rec_t * xfs_inobt_rec_addr(xfs_inobt_block_t *bb, int i, struct xfs_btree_cur *cur); -#define XFS_INOBT_REC_ADDR(bb,i,cur) xfs_inobt_rec_addr(bb,i,cur) +#define XFS_INOBT_REC_ADDR(bb,i,cur) xfs_inobt_rec_addr(bb,i,cur) #else -#define XFS_INOBT_REC_ADDR(bb,i,cur) \ +#define XFS_INOBT_REC_ADDR(bb,i,cur) \ XFS_BTREE_REC_ADDR(XFS_INOBT_BLOCK_SIZE(0,cur), xfs_inobt, bb, i, \ XFS_INOBT_BLOCK_MAXRECS(0, cur)) #endif @@ -194,9 +194,9 @@ xfs_inobt_rec_addr(xfs_inobt_block_t *bb, int i, struct xfs_btree_cur *cur); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INOBT_KEY_ADDR) xfs_inobt_key_t * xfs_inobt_key_addr(xfs_inobt_block_t *bb, int i, struct xfs_btree_cur *cur); -#define XFS_INOBT_KEY_ADDR(bb,i,cur) xfs_inobt_key_addr(bb,i,cur) +#define XFS_INOBT_KEY_ADDR(bb,i,cur) xfs_inobt_key_addr(bb,i,cur) #else -#define XFS_INOBT_KEY_ADDR(bb,i,cur) \ +#define XFS_INOBT_KEY_ADDR(bb,i,cur) \ XFS_BTREE_KEY_ADDR(XFS_INOBT_BLOCK_SIZE(1,cur), xfs_inobt, bb, i, \ XFS_INOBT_BLOCK_MAXRECS(1, cur)) #endif @@ -204,9 +204,9 @@ xfs_inobt_key_addr(xfs_inobt_block_t *bb, int i, struct xfs_btree_cur *cur); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INOBT_PTR_ADDR) xfs_inobt_ptr_t * xfs_inobt_ptr_addr(xfs_inobt_block_t *bb, int i, struct xfs_btree_cur *cur); -#define XFS_INOBT_PTR_ADDR(bb,i,cur) xfs_inobt_ptr_addr(bb,i,cur) +#define XFS_INOBT_PTR_ADDR(bb,i,cur) xfs_inobt_ptr_addr(bb,i,cur) #else -#define XFS_INOBT_PTR_ADDR(bb,i,cur) \ +#define XFS_INOBT_PTR_ADDR(bb,i,cur) \ XFS_BTREE_PTR_ADDR(XFS_INOBT_BLOCK_SIZE(1,cur), xfs_inobt, bb, i, \ XFS_INOBT_BLOCK_MAXRECS(1, cur)) #endif @@ -234,7 +234,7 @@ xfs_inobt_decrement( int /* error */ xfs_inobt_delete( struct xfs_btree_cur *cur, /* btree cursor */ - int *stat); /* success/failure */ + int *stat); /* success/failure */ #endif /* _NOTYET_ */ /* @@ -257,7 +257,7 @@ int /* error */ xfs_inobt_increment( struct xfs_btree_cur *cur, /* btree cursor */ int level, /* level in btree, 0 is leaf */ - int *stat); /* success/failure */ + int *stat); /* success/failure */ /* * Insert the current record at the point referenced by cur. @@ -266,7 +266,7 @@ xfs_inobt_increment( int /* error */ xfs_inobt_insert( struct xfs_btree_cur *cur, /* btree cursor */ - int *stat); /* success/failure */ + int *stat); /* success/failure */ /* * Lookup the record equal to ino in the btree given by cur. @@ -277,7 +277,7 @@ xfs_inobt_lookup_eq( xfs_agino_t ino, /* starting inode of chunk */ __int32_t fcnt, /* free inode count */ xfs_inofree_t free, /* free inode mask */ - int *stat); /* success/failure */ + int *stat); /* success/failure */ /* * Lookup the first record greater than or equal to ino @@ -289,7 +289,7 @@ xfs_inobt_lookup_ge( xfs_agino_t ino, /* starting inode of chunk */ __int32_t fcnt, /* free inode count */ xfs_inofree_t free, /* free inode mask */ - int *stat); /* success/failure */ + int *stat); /* success/failure */ /* * Lookup the first record less than or equal to ino @@ -301,7 +301,7 @@ xfs_inobt_lookup_le( xfs_agino_t ino, /* starting inode of chunk */ __int32_t fcnt, /* free inode count */ xfs_inofree_t free, /* free inode mask */ - int *stat); /* success/failure */ + int *stat); /* success/failure */ /* * Update the record referred to by cur, to the value given diff --git a/include/xfs_imap.h b/include/xfs_imap.h index 40cbb47e7..e385064a0 100644 --- a/include/xfs_imap.h +++ b/include/xfs_imap.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_IMAP_H__ -#define __XFS_IMAP_H__ +#define __XFS_IMAP_H__ /* * This is the structure passed to xfs_imap() to map diff --git a/include/xfs_inode.h b/include/xfs_inode.h index a3836f421..9b68c5f1a 100644 --- a/include/xfs_inode.h +++ b/include/xfs_inode.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -29,19 +29,19 @@ * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ -#ifndef __XFS_INODE_H__ -#define __XFS_INODE_H__ +#ifndef __XFS_INODE_H__ +#define __XFS_INODE_H__ /* * File incore extent information, present for each of data & attr forks. */ -#define XFS_INLINE_EXTS 2 -#define XFS_INLINE_DATA 32 +#define XFS_INLINE_EXTS 2 +#define XFS_INLINE_DATA 32 typedef struct xfs_ifork { int if_bytes; /* bytes in if_u1 */ int if_real_bytes; /* bytes allocated in if_u1 */ xfs_bmbt_block_t *if_broot; /* file's incore btree root */ - short if_broot_bytes; /* bytes allocated for root */ + short if_broot_bytes; /* bytes allocated for root */ unsigned char if_flags; /* per-fork flags */ unsigned char if_ext_max; /* max # of extent records */ xfs_extnum_t if_lastex; /* last if_extents used */ @@ -62,26 +62,26 @@ typedef struct xfs_ifork { /* * Flags for xfs_ichgtime(). */ -#define XFS_ICHGTIME_MOD 0x1 /* data fork modification timestamp */ -#define XFS_ICHGTIME_ACC 0x2 /* data fork access timestamp */ -#define XFS_ICHGTIME_CHG 0x4 /* inode field change timestamp */ +#define XFS_ICHGTIME_MOD 0x1 /* data fork modification timestamp */ +#define XFS_ICHGTIME_ACC 0x2 /* data fork access timestamp */ +#define XFS_ICHGTIME_CHG 0x4 /* inode field change timestamp */ /* * Per-fork incore inode flags. */ -#define XFS_IFINLINE 0x0001 /* Inline data is read in */ -#define XFS_IFEXTENTS 0x0002 /* All extent pointers are read in */ -#define XFS_IFBROOT 0x0004 /* i_broot points to the bmap b-tree root */ +#define XFS_IFINLINE 0x0001 /* Inline data is read in */ +#define XFS_IFEXTENTS 0x0002 /* All extent pointers are read in */ +#define XFS_IFBROOT 0x0004 /* i_broot points to the bmap b-tree root */ /* * Flags for xfs_imap() and xfs_dilocate(). */ -#define XFS_IMAP_LOOKUP 0x1 +#define XFS_IMAP_LOOKUP 0x1 /* * Maximum number of extent pointers in if_u1.if_extents. */ -#define XFS_MAX_INCORE_EXTENTS 32768 +#define XFS_MAX_INCORE_EXTENTS 32768 #ifdef __KERNEL__ @@ -144,8 +144,8 @@ typedef struct xfs_iocore { } xfs_iocore_t; -#define io_dmevmask io_dmattrs.da_dmevmask -#define io_dmstate io_dmattrs.da_dmstate +#define io_dmevmask io_dmattrs.da_dmevmask +#define io_dmstate io_dmattrs.da_dmstate #define XFS_IO_INODE(io) ((xfs_inode_t *) ((io)->io_obj)) #define XFS_IO_DCXVN(io) ((dcxvn_t *) ((io)->io_obj)) @@ -170,7 +170,7 @@ extern void xfs_iocore_inode_reinit(struct xfs_inode *); * file system to hash the inodes for that file system. */ typedef struct xfs_ihash { - struct xfs_inode *ih_next; + struct xfs_inode *ih_next; rwlock_t ih_lock; uint ih_version; } xfs_ihash_t; @@ -182,7 +182,7 @@ typedef struct xfs_ihash { #define XFS_IHASH(mp,ino) ((mp)->m_ihash + (((uint)ino) % (mp)->m_ihsize)) /* - * This is the xfs inode cluster hash. This hash is used by xfs_iflush to + * This is the xfs inode cluster hash. This hash is used by xfs_iflush to * find inodes that share a cluster and can be flushed to disk at the same * time. */ @@ -208,7 +208,7 @@ typedef struct xfs_chash { * Most of the on-disk inode is embedded in the i_d field. * * The extent pointers/inline file space, however, are managed - * separately. The memory for this information is pointed to by + * separately. The memory for this information is pointed to by * the if_u1 unions depending on the type of the data. * This is used to linearize the array of extents for fast in-core * access. This is used until the file's number of extents @@ -276,7 +276,7 @@ typedef struct xfs_inode { unsigned char i_update_core; /* timestamps/size is dirty */ unsigned char i_update_size; /* di_size field is dirty */ unsigned int i_gen; /* generation count */ - unsigned int i_delayed_blks; /* count of delay alloc blks */ + unsigned int i_delayed_blks; /* count of delay alloc blks */ xfs_dinode_core_t i_d; /* most of ondisk inode */ xfs_chashlist_t *i_chash; /* cluster hash list header */ @@ -288,7 +288,7 @@ typedef struct xfs_inode { struct ktrace *i_xtrace; /* inode extent list trace */ struct ktrace *i_btrace; /* inode bmap btree trace */ struct ktrace *i_rwtrace; /* inode read/write trace */ - struct ktrace *i_strat_trace; /* inode strat_write trace */ + struct ktrace *i_strat_trace; /* inode strat_write trace */ struct ktrace *i_lock_trace; /* inode lock/unlock trace */ struct ktrace *i_dir_trace; /* inode directory trace */ #endif /* DEBUG */ @@ -302,57 +302,57 @@ typedef struct xfs_inode { */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_IFORK_PTR) xfs_ifork_t *xfs_ifork_ptr(xfs_inode_t *ip, int w); -#define XFS_IFORK_PTR(ip,w) xfs_ifork_ptr(ip,w) +#define XFS_IFORK_PTR(ip,w) xfs_ifork_ptr(ip,w) #else -#define XFS_IFORK_PTR(ip,w) ((w) == XFS_DATA_FORK ? &(ip)->i_df : (ip)->i_afp) +#define XFS_IFORK_PTR(ip,w) ((w) == XFS_DATA_FORK ? &(ip)->i_df : (ip)->i_afp) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_IFORK_Q) int xfs_ifork_q(xfs_inode_t *ip); -#define XFS_IFORK_Q(ip) xfs_ifork_q(ip) +#define XFS_IFORK_Q(ip) xfs_ifork_q(ip) #else -#define XFS_IFORK_Q(ip) XFS_CFORK_Q(&(ip)->i_d) +#define XFS_IFORK_Q(ip) XFS_CFORK_Q(&(ip)->i_d) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_IFORK_DSIZE) int xfs_ifork_dsize(xfs_inode_t *ip); -#define XFS_IFORK_DSIZE(ip) xfs_ifork_dsize(ip) +#define XFS_IFORK_DSIZE(ip) xfs_ifork_dsize(ip) #else -#define XFS_IFORK_DSIZE(ip) XFS_CFORK_DSIZE(&ip->i_d, ip->i_mount) +#define XFS_IFORK_DSIZE(ip) XFS_CFORK_DSIZE(&ip->i_d, ip->i_mount) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_IFORK_ASIZE) int xfs_ifork_asize(xfs_inode_t *ip); -#define XFS_IFORK_ASIZE(ip) xfs_ifork_asize(ip) +#define XFS_IFORK_ASIZE(ip) xfs_ifork_asize(ip) #else -#define XFS_IFORK_ASIZE(ip) XFS_CFORK_ASIZE(&ip->i_d, ip->i_mount) +#define XFS_IFORK_ASIZE(ip) XFS_CFORK_ASIZE(&ip->i_d, ip->i_mount) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_IFORK_SIZE) int xfs_ifork_size(xfs_inode_t *ip, int w); -#define XFS_IFORK_SIZE(ip,w) xfs_ifork_size(ip,w) +#define XFS_IFORK_SIZE(ip,w) xfs_ifork_size(ip,w) #else -#define XFS_IFORK_SIZE(ip,w) XFS_CFORK_SIZE(&ip->i_d, ip->i_mount, w) +#define XFS_IFORK_SIZE(ip,w) XFS_CFORK_SIZE(&ip->i_d, ip->i_mount, w) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_IFORK_FORMAT) int xfs_ifork_format(xfs_inode_t *ip, int w); -#define XFS_IFORK_FORMAT(ip,w) xfs_ifork_format(ip,w) +#define XFS_IFORK_FORMAT(ip,w) xfs_ifork_format(ip,w) #else -#define XFS_IFORK_FORMAT(ip,w) XFS_CFORK_FORMAT(&ip->i_d, w) +#define XFS_IFORK_FORMAT(ip,w) XFS_CFORK_FORMAT(&ip->i_d, w) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_IFORK_FMT_SET) void xfs_ifork_fmt_set(xfs_inode_t *ip, int w, int n); -#define XFS_IFORK_FMT_SET(ip,w,n) xfs_ifork_fmt_set(ip,w,n) +#define XFS_IFORK_FMT_SET(ip,w,n) xfs_ifork_fmt_set(ip,w,n) #else -#define XFS_IFORK_FMT_SET(ip,w,n) XFS_CFORK_FMT_SET(&ip->i_d, w, n) +#define XFS_IFORK_FMT_SET(ip,w,n) XFS_CFORK_FMT_SET(&ip->i_d, w, n) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_IFORK_NEXTENTS) int xfs_ifork_nextents(xfs_inode_t *ip, int w); -#define XFS_IFORK_NEXTENTS(ip,w) xfs_ifork_nextents(ip,w) +#define XFS_IFORK_NEXTENTS(ip,w) xfs_ifork_nextents(ip,w) #else -#define XFS_IFORK_NEXTENTS(ip,w) XFS_CFORK_NEXTENTS(&ip->i_d, w) +#define XFS_IFORK_NEXTENTS(ip,w) XFS_CFORK_NEXTENTS(&ip->i_d, w) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_IFORK_NEXT_SET) void xfs_ifork_next_set(xfs_inode_t *ip, int w, int n); -#define XFS_IFORK_NEXT_SET(ip,w,n) xfs_ifork_next_set(ip,w,n) +#define XFS_IFORK_NEXT_SET(ip,w,n) xfs_ifork_next_set(ip,w,n) #else -#define XFS_IFORK_NEXT_SET(ip,w,n) XFS_CFORK_NEXT_SET(&ip->i_d, w, n) +#define XFS_IFORK_NEXT_SET(ip,w,n) XFS_CFORK_NEXT_SET(&ip->i_d, w, n) #endif @@ -361,25 +361,25 @@ void xfs_ifork_next_set(xfs_inode_t *ip, int w, int n); /* * In-core inode flags. */ -#define XFS_IGRIO 0x0001 /* inode used for guaranteed rate i/o */ -#define XFS_IUIOSZ 0x0002 /* inode i/o sizes have been explicitly set */ -#define XFS_IQUIESCE 0x0004 /* we have started quiescing for this inode */ -#define XFS_IRECLAIM 0x0008 /* we have started reclaiming this inode */ +#define XFS_IGRIO 0x0001 /* inode used for guaranteed rate i/o */ +#define XFS_IUIOSZ 0x0002 /* inode i/o sizes have been explicitly set */ +#define XFS_IQUIESCE 0x0004 /* we have started quiescing for this inode */ +#define XFS_IRECLAIM 0x0008 /* we have started reclaiming this inode */ /* * Flags for inode locking. */ -#define XFS_IOLOCK_EXCL 0x001 -#define XFS_IOLOCK_SHARED 0x002 -#define XFS_ILOCK_EXCL 0x004 -#define XFS_ILOCK_SHARED 0x008 -#define XFS_IUNLOCK_NONOTIFY 0x010 +#define XFS_IOLOCK_EXCL 0x001 +#define XFS_IOLOCK_SHARED 0x002 +#define XFS_ILOCK_EXCL 0x004 +#define XFS_ILOCK_SHARED 0x008 +#define XFS_IUNLOCK_NONOTIFY 0x010 #define XFS_EXTENT_TOKEN_RD 0x040 #define XFS_SIZE_TOKEN_RD 0x080 #define XFS_EXTSIZE_RD (XFS_EXTENT_TOKEN_RD|XFS_SIZE_TOKEN_RD) #define XFS_WILLLEND 0x100 /* Always acquire tokens for lending */ #define XFS_EXTENT_TOKEN_WR (XFS_EXTENT_TOKEN_RD | XFS_WILLLEND) -#define XFS_SIZE_TOKEN_WR (XFS_SIZE_TOKEN_RD | XFS_WILLLEND) +#define XFS_SIZE_TOKEN_WR (XFS_SIZE_TOKEN_RD | XFS_WILLLEND) #define XFS_EXTSIZE_WR (XFS_EXTSIZE_RD | XFS_WILLLEND) @@ -391,22 +391,22 @@ void xfs_ifork_next_set(xfs_inode_t *ip, int w, int n); /* * Flags for xfs_iflush() */ -#define XFS_IFLUSH_DELWRI_ELSE_SYNC 1 -#define XFS_IFLUSH_DELWRI_ELSE_ASYNC 2 -#define XFS_IFLUSH_SYNC 3 -#define XFS_IFLUSH_ASYNC 4 -#define XFS_IFLUSH_DELWRI 5 +#define XFS_IFLUSH_DELWRI_ELSE_SYNC 1 +#define XFS_IFLUSH_DELWRI_ELSE_ASYNC 2 +#define XFS_IFLUSH_SYNC 3 +#define XFS_IFLUSH_ASYNC 4 +#define XFS_IFLUSH_DELWRI 5 /* * Flags for xfs_iflush_all. */ -#define XFS_FLUSH_ALL 0x1 +#define XFS_FLUSH_ALL 0x1 /* * Flags for xfs_itruncate_start(). */ -#define XFS_ITRUNC_DEFINITE 0x1 -#define XFS_ITRUNC_MAYBE 0x2 +#define XFS_ITRUNC_DEFINITE 0x1 +#define XFS_ITRUNC_MAYBE 0x2 /* * max file offset is 2^(31+PAGE_SHIFT) - 1 (due to linux page cache) @@ -418,22 +418,22 @@ void xfs_ifork_next_set(xfs_inode_t *ip, int w, int n); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_ITOV) struct vnode *xfs_itov(xfs_inode_t *ip); -#define XFS_ITOV(ip) xfs_itov(ip) +#define XFS_ITOV(ip) xfs_itov(ip) #else -#define XFS_ITOV(ip) BHV_TO_VNODE(XFS_ITOBHV(ip)) +#define XFS_ITOV(ip) BHV_TO_VNODE(XFS_ITOBHV(ip)) #endif -#define XFS_ITOV_NULL(ip) BHV_TO_VNODE_NULL(XFS_ITOBHV(ip)) +#define XFS_ITOV_NULL(ip) BHV_TO_VNODE_NULL(XFS_ITOBHV(ip)) #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_ITOBHV) struct bhv_desc *xfs_itobhv(xfs_inode_t *ip); -#define XFS_ITOBHV(ip) xfs_itobhv(ip) +#define XFS_ITOBHV(ip) xfs_itobhv(ip) #else -#define XFS_ITOBHV(ip) ((struct bhv_desc *)(&((ip)->i_bhv_desc))) +#define XFS_ITOBHV(ip) ((struct bhv_desc *)(&((ip)->i_bhv_desc))) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_BHVTOI) xfs_inode_t *xfs_bhvtoi(struct bhv_desc *bhvp); -#define XFS_BHVTOI(bhvp) xfs_bhvtoi(bhvp) +#define XFS_BHVTOI(bhvp) xfs_bhvtoi(bhvp) #else -#define XFS_BHVTOI(bhvp) \ +#define XFS_BHVTOI(bhvp) \ ((xfs_inode_t *)((char *)(bhvp) - \ (char *)&(((xfs_inode_t *)0)->i_bhv_desc))) #endif @@ -463,7 +463,7 @@ void xfs_chash_init(struct xfs_mount *); void xfs_chash_free(struct xfs_mount *); xfs_inode_t *xfs_inode_incore(struct xfs_mount *, xfs_ino_t, struct xfs_trans *); -void xfs_inode_lock_init(xfs_inode_t *, struct vnode *); +void xfs_inode_lock_init(xfs_inode_t *, struct vnode *); int xfs_iget(struct xfs_mount *, struct xfs_trans *, xfs_ino_t, uint, xfs_inode_t **, xfs_daddr_t); void xfs_iput(xfs_inode_t *, uint); @@ -535,7 +535,7 @@ void xfs_isize_check(struct xfs_mount *, xfs_inode_t *, xfs_fsize_t); #if defined(DEBUG) void xfs_inobp_check(struct xfs_mount *, struct xfs_buf *); #else -#define xfs_inobp_check(mp, bp) +#define xfs_inobp_check(mp, bp) #endif /* DEBUG */ extern struct kmem_zone *xfs_chashlist_zone; diff --git a/include/xfs_inode_item.h b/include/xfs_inode_item.h index c893dbfc9..ffd20f88f 100644 --- a/include/xfs_inode_item.h +++ b/include/xfs_inode_item.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -29,12 +29,12 @@ * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ -#ifndef __XFS_INODE_ITEM_H__ -#define __XFS_INODE_ITEM_H__ +#ifndef __XFS_INODE_ITEM_H__ +#define __XFS_INODE_ITEM_H__ /* * This is the structure used to lay out an inode log item in the - * log. The size of the inline data/extents/b-tree root to be logged + * log. The size of the inline data/extents/b-tree root to be logged * (if any) is indicated in the ilf_dsize field. Changes to this structure * must be added on to the end. * @@ -48,13 +48,13 @@ * -Version 2 of this structure (XFS_LI_6_1_INODE) is currently the entire * structure. This was released with IRIX 6.0.1-XFS and IRIX 6.1. * -Version 3 of this structure (XFS_LI_INODE) is the same as version 2 - * so a new structure definition wasn't necessary. However, we had + * so a new structure definition wasn't necessary. However, we had * to add a new type because the inode cluster size changed from 4K * to 8K and the version number had to be rev'ved to keep older kernels * from trying to recover logs with the 8K buffers in them. The logging * code can handle recovery on different-sized clusters now so hopefully * this'll be the last time we need to change the inode log item just - * for a change in the inode cluster size. This new version was + * for a change in the inode cluster size. This new version was * released with IRIX 6.2. */ typedef struct xfs_inode_log_format { @@ -89,38 +89,38 @@ typedef struct xfs_inode_log_format_v1 { /* * Flags for xfs_trans_log_inode flags field. */ -#define XFS_ILOG_CORE 0x001 /* log standard inode fields */ -#define XFS_ILOG_DDATA 0x002 /* log i_df.if_data */ -#define XFS_ILOG_DEXT 0x004 /* log i_df.if_extents */ -#define XFS_ILOG_DBROOT 0x008 /* log i_df.i_broot */ -#define XFS_ILOG_DEV 0x010 /* log the dev field */ -#define XFS_ILOG_UUID 0x020 /* log the uuid field */ -#define XFS_ILOG_ADATA 0x040 /* log i_af.if_data */ -#define XFS_ILOG_AEXT 0x080 /* log i_af.if_extents */ -#define XFS_ILOG_ABROOT 0x100 /* log i_af.i_broot */ - -#define XFS_ILOG_NONCORE (XFS_ILOG_DDATA | XFS_ILOG_DEXT | \ +#define XFS_ILOG_CORE 0x001 /* log standard inode fields */ +#define XFS_ILOG_DDATA 0x002 /* log i_df.if_data */ +#define XFS_ILOG_DEXT 0x004 /* log i_df.if_extents */ +#define XFS_ILOG_DBROOT 0x008 /* log i_df.i_broot */ +#define XFS_ILOG_DEV 0x010 /* log the dev field */ +#define XFS_ILOG_UUID 0x020 /* log the uuid field */ +#define XFS_ILOG_ADATA 0x040 /* log i_af.if_data */ +#define XFS_ILOG_AEXT 0x080 /* log i_af.if_extents */ +#define XFS_ILOG_ABROOT 0x100 /* log i_af.i_broot */ + +#define XFS_ILOG_NONCORE (XFS_ILOG_DDATA | XFS_ILOG_DEXT | \ XFS_ILOG_DBROOT | XFS_ILOG_DEV | \ XFS_ILOG_UUID | XFS_ILOG_ADATA | \ XFS_ILOG_AEXT | XFS_ILOG_ABROOT) -#define XFS_ILOG_DFORK (XFS_ILOG_DDATA | XFS_ILOG_DEXT | \ +#define XFS_ILOG_DFORK (XFS_ILOG_DDATA | XFS_ILOG_DEXT | \ XFS_ILOG_DBROOT) -#define XFS_ILOG_AFORK (XFS_ILOG_ADATA | XFS_ILOG_AEXT | \ +#define XFS_ILOG_AFORK (XFS_ILOG_ADATA | XFS_ILOG_AEXT | \ XFS_ILOG_ABROOT) -#define XFS_ILOG_ALL (XFS_ILOG_CORE | XFS_ILOG_DDATA | \ +#define XFS_ILOG_ALL (XFS_ILOG_CORE | XFS_ILOG_DDATA | \ XFS_ILOG_DEXT | XFS_ILOG_DBROOT | \ XFS_ILOG_DEV | XFS_ILOG_UUID | \ XFS_ILOG_ADATA | XFS_ILOG_AEXT | \ XFS_ILOG_ABROOT) -#define XFS_ILI_HOLD 0x1 -#define XFS_ILI_IOLOCKED_EXCL 0x2 -#define XFS_ILI_IOLOCKED_SHARED 0x4 +#define XFS_ILI_HOLD 0x1 +#define XFS_ILI_IOLOCKED_EXCL 0x2 +#define XFS_ILI_IOLOCKED_SHARED 0x4 -#define XFS_ILI_IOLOCKED_ANY (XFS_ILI_IOLOCKED_EXCL | XFS_ILI_IOLOCKED_SHARED) +#define XFS_ILI_IOLOCKED_ANY (XFS_ILI_IOLOCKED_EXCL | XFS_ILI_IOLOCKED_SHARED) #ifdef __KERNEL__ @@ -145,10 +145,10 @@ typedef struct xfs_inode_log_item { data exts */ struct xfs_bmbt_rec_64 *ili_aextents_buf; /* array of logged attr exts */ - unsigned int ili_pushbuf_flag; /* one bit used in push_ail */ + unsigned int ili_pushbuf_flag; /* one bit used in push_ail */ #ifdef DEBUG - uint64_t ili_push_owner; /* one who sets pushbuf_flag + uint64_t ili_push_owner; /* one who sets pushbuf_flag above gets to push the buf */ #endif #ifdef XFS_TRANS_DEBUG @@ -161,9 +161,9 @@ typedef struct xfs_inode_log_item { #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_ILOG_FDATA) int xfs_ilog_fdata(int w); -#define XFS_ILOG_FDATA(w) xfs_ilog_fdata(w) +#define XFS_ILOG_FDATA(w) xfs_ilog_fdata(w) #else -#define XFS_ILOG_FDATA(w) \ +#define XFS_ILOG_FDATA(w) \ ((w) == XFS_DATA_FORK ? XFS_ILOG_DDATA : XFS_ILOG_ADATA) #endif @@ -171,16 +171,16 @@ int xfs_ilog_fdata(int w); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_ILOG_FBROOT) int xfs_ilog_fbroot(int w); -#define XFS_ILOG_FBROOT(w) xfs_ilog_fbroot(w) +#define XFS_ILOG_FBROOT(w) xfs_ilog_fbroot(w) #else -#define XFS_ILOG_FBROOT(w) \ +#define XFS_ILOG_FBROOT(w) \ ((w) == XFS_DATA_FORK ? XFS_ILOG_DBROOT : XFS_ILOG_ABROOT) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_ILOG_FEXT) int xfs_ilog_fext(int w); -#define XFS_ILOG_FEXT(w) xfs_ilog_fext(w) +#define XFS_ILOG_FEXT(w) xfs_ilog_fext(w) #else -#define XFS_ILOG_FEXT(w) \ +#define XFS_ILOG_FEXT(w) \ ((w) == XFS_DATA_FORK ? XFS_ILOG_DEXT : XFS_ILOG_AEXT) #endif diff --git a/include/xfs_inum.h b/include/xfs_inum.h index 7fa4aca62..044306dc4 100644 --- a/include/xfs_inum.h +++ b/include/xfs_inum.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_INUM_H__ -#define __XFS_INUM_H__ +#define __XFS_INUM_H__ /* * Inode number format: @@ -40,7 +40,7 @@ * high agno_log-agblklog-inopblog bits - 0 */ -typedef __uint32_t xfs_agino_t; /* within allocation grp inode number */ +typedef __uint32_t xfs_agino_t; /* within allocation grp inode number */ /* * Useful inode bits for this kernel. @@ -48,126 +48,126 @@ typedef __uint32_t xfs_agino_t; /* within allocation grp inode number */ * costs too much. */ #if XFS_BIG_FILESYSTEMS -typedef xfs_ino_t xfs_intino_t; +typedef xfs_ino_t xfs_intino_t; #else -typedef __uint32_t xfs_intino_t; +typedef __uint32_t xfs_intino_t; #endif -#define NULLFSINO ((xfs_ino_t)-1) -#define NULLAGINO ((xfs_agino_t)-1) +#define NULLFSINO ((xfs_ino_t)-1) +#define NULLAGINO ((xfs_agino_t)-1) struct xfs_mount; #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INO_MASK) __uint32_t xfs_ino_mask(int k); -#define XFS_INO_MASK(k) xfs_ino_mask(k) +#define XFS_INO_MASK(k) xfs_ino_mask(k) #else -#define XFS_INO_MASK(k) ((__uint32_t)((1ULL << (k)) - 1)) +#define XFS_INO_MASK(k) ((__uint32_t)((1ULL << (k)) - 1)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INO_OFFSET_BITS) int xfs_ino_offset_bits(struct xfs_mount *mp); -#define XFS_INO_OFFSET_BITS(mp) xfs_ino_offset_bits(mp) +#define XFS_INO_OFFSET_BITS(mp) xfs_ino_offset_bits(mp) #else -#define XFS_INO_OFFSET_BITS(mp) ((mp)->m_sb.sb_inopblog) +#define XFS_INO_OFFSET_BITS(mp) ((mp)->m_sb.sb_inopblog) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INO_AGBNO_BITS) int xfs_ino_agbno_bits(struct xfs_mount *mp); -#define XFS_INO_AGBNO_BITS(mp) xfs_ino_agbno_bits(mp) +#define XFS_INO_AGBNO_BITS(mp) xfs_ino_agbno_bits(mp) #else -#define XFS_INO_AGBNO_BITS(mp) ((mp)->m_sb.sb_agblklog) +#define XFS_INO_AGBNO_BITS(mp) ((mp)->m_sb.sb_agblklog) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INO_AGINO_BITS) int xfs_ino_agino_bits(struct xfs_mount *mp); -#define XFS_INO_AGINO_BITS(mp) xfs_ino_agino_bits(mp) +#define XFS_INO_AGINO_BITS(mp) xfs_ino_agino_bits(mp) #else -#define XFS_INO_AGINO_BITS(mp) ((mp)->m_agino_log) +#define XFS_INO_AGINO_BITS(mp) ((mp)->m_agino_log) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INO_AGNO_BITS) int xfs_ino_agno_bits(struct xfs_mount *mp); -#define XFS_INO_AGNO_BITS(mp) xfs_ino_agno_bits(mp) +#define XFS_INO_AGNO_BITS(mp) xfs_ino_agno_bits(mp) #else -#define XFS_INO_AGNO_BITS(mp) ((mp)->m_agno_log) +#define XFS_INO_AGNO_BITS(mp) ((mp)->m_agno_log) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INO_BITS) int xfs_ino_bits(struct xfs_mount *mp); -#define XFS_INO_BITS(mp) xfs_ino_bits(mp) +#define XFS_INO_BITS(mp) xfs_ino_bits(mp) #else -#define XFS_INO_BITS(mp) (XFS_INO_AGNO_BITS(mp) + XFS_INO_AGINO_BITS(mp)) +#define XFS_INO_BITS(mp) (XFS_INO_AGNO_BITS(mp) + XFS_INO_AGINO_BITS(mp)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INO_TO_AGNO) xfs_agnumber_t xfs_ino_to_agno(struct xfs_mount *mp, xfs_ino_t i); -#define XFS_INO_TO_AGNO(mp,i) xfs_ino_to_agno(mp,i) +#define XFS_INO_TO_AGNO(mp,i) xfs_ino_to_agno(mp,i) #else -#define XFS_INO_TO_AGNO(mp,i) \ +#define XFS_INO_TO_AGNO(mp,i) \ ((xfs_agnumber_t)((i) >> XFS_INO_AGINO_BITS(mp))) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INO_TO_AGINO) xfs_agino_t xfs_ino_to_agino(struct xfs_mount *mp, xfs_ino_t i); -#define XFS_INO_TO_AGINO(mp,i) xfs_ino_to_agino(mp,i) +#define XFS_INO_TO_AGINO(mp,i) xfs_ino_to_agino(mp,i) #else -#define XFS_INO_TO_AGINO(mp,i) \ +#define XFS_INO_TO_AGINO(mp,i) \ ((xfs_agino_t)(i) & XFS_INO_MASK(XFS_INO_AGINO_BITS(mp))) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INO_TO_AGBNO) xfs_agblock_t xfs_ino_to_agbno(struct xfs_mount *mp, xfs_ino_t i); -#define XFS_INO_TO_AGBNO(mp,i) xfs_ino_to_agbno(mp,i) +#define XFS_INO_TO_AGBNO(mp,i) xfs_ino_to_agbno(mp,i) #else -#define XFS_INO_TO_AGBNO(mp,i) \ +#define XFS_INO_TO_AGBNO(mp,i) \ (((xfs_agblock_t)(i) >> XFS_INO_OFFSET_BITS(mp)) & \ XFS_INO_MASK(XFS_INO_AGBNO_BITS(mp))) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INO_TO_OFFSET) int xfs_ino_to_offset(struct xfs_mount *mp, xfs_ino_t i); -#define XFS_INO_TO_OFFSET(mp,i) xfs_ino_to_offset(mp,i) +#define XFS_INO_TO_OFFSET(mp,i) xfs_ino_to_offset(mp,i) #else -#define XFS_INO_TO_OFFSET(mp,i) \ +#define XFS_INO_TO_OFFSET(mp,i) \ ((int)(i) & XFS_INO_MASK(XFS_INO_OFFSET_BITS(mp))) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_INO_TO_FSB) xfs_fsblock_t xfs_ino_to_fsb(struct xfs_mount *mp, xfs_ino_t i); -#define XFS_INO_TO_FSB(mp,i) xfs_ino_to_fsb(mp,i) +#define XFS_INO_TO_FSB(mp,i) xfs_ino_to_fsb(mp,i) #else -#define XFS_INO_TO_FSB(mp,i) \ +#define XFS_INO_TO_FSB(mp,i) \ XFS_AGB_TO_FSB(mp, XFS_INO_TO_AGNO(mp,i), XFS_INO_TO_AGBNO(mp,i)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AGINO_TO_INO) xfs_ino_t xfs_agino_to_ino(struct xfs_mount *mp, xfs_agnumber_t a, xfs_agino_t i); -#define XFS_AGINO_TO_INO(mp,a,i) xfs_agino_to_ino(mp,a,i) +#define XFS_AGINO_TO_INO(mp,a,i) xfs_agino_to_ino(mp,a,i) #else -#define XFS_AGINO_TO_INO(mp,a,i) \ +#define XFS_AGINO_TO_INO(mp,a,i) \ (((xfs_ino_t)(a) << XFS_INO_AGINO_BITS(mp)) | (i)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AGINO_TO_AGBNO) xfs_agblock_t xfs_agino_to_agbno(struct xfs_mount *mp, xfs_agino_t i); -#define XFS_AGINO_TO_AGBNO(mp,i) xfs_agino_to_agbno(mp,i) +#define XFS_AGINO_TO_AGBNO(mp,i) xfs_agino_to_agbno(mp,i) #else -#define XFS_AGINO_TO_AGBNO(mp,i) ((i) >> XFS_INO_OFFSET_BITS(mp)) +#define XFS_AGINO_TO_AGBNO(mp,i) ((i) >> XFS_INO_OFFSET_BITS(mp)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_AGINO_TO_OFFSET) int xfs_agino_to_offset(struct xfs_mount *mp, xfs_agino_t i); -#define XFS_AGINO_TO_OFFSET(mp,i) xfs_agino_to_offset(mp,i) +#define XFS_AGINO_TO_OFFSET(mp,i) xfs_agino_to_offset(mp,i) #else -#define XFS_AGINO_TO_OFFSET(mp,i) \ +#define XFS_AGINO_TO_OFFSET(mp,i) \ ((i) & XFS_INO_MASK(XFS_INO_OFFSET_BITS(mp))) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_OFFBNO_TO_AGINO) xfs_agino_t xfs_offbno_to_agino(struct xfs_mount *mp, xfs_agblock_t b, int o); -#define XFS_OFFBNO_TO_AGINO(mp,b,o) xfs_offbno_to_agino(mp,b,o) +#define XFS_OFFBNO_TO_AGINO(mp,b,o) xfs_offbno_to_agino(mp,b,o) #else -#define XFS_OFFBNO_TO_AGINO(mp,b,o) \ +#define XFS_OFFBNO_TO_AGINO(mp,b,o) \ ((xfs_agino_t)(((b) << XFS_INO_OFFSET_BITS(mp)) | (o))) #endif #if XFS_BIG_FILESYSTEMS -#define XFS_MAXINUMBER ((xfs_ino_t)((1ULL << 56) - 1ULL)) -#define XFS_INO64_OFFSET ((xfs_ino_t)(1ULL << 32)) +#define XFS_MAXINUMBER ((xfs_ino_t)((1ULL << 56) - 1ULL)) +#define XFS_INO64_OFFSET ((xfs_ino_t)(1ULL << 32)) #else -#define XFS_MAXINUMBER ((xfs_ino_t)((1ULL << 32) - 1ULL)) +#define XFS_MAXINUMBER ((xfs_ino_t)((1ULL << 32) - 1ULL)) #endif -#define XFS_MAXINUMBER_32 ((xfs_ino_t)((1ULL << 32) - 1ULL)) +#define XFS_MAXINUMBER_32 ((xfs_ino_t)((1ULL << 32) - 1ULL)) #endif /* __XFS_INUM_H__ */ diff --git a/include/xfs_log.h b/include/xfs_log.h index e6c1a8a78..7b280da83 100644 --- a/include/xfs_log.h +++ b/include/xfs_log.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -29,7 +29,7 @@ * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ -#ifndef __XFS_LOG_H__ +#ifndef __XFS_LOG_H__ #define __XFS_LOG_H__ #if __BYTE_ORDER == __LITTLE_ENDIAN @@ -69,10 +69,10 @@ xfs_lsn_t _lsn_cmp(xfs_lsn_t lsn1, xfs_lsn_t lsn2, xfs_arch_t arch) return 0; } -#define XFS_LSN_CMP_ARCH(x,y,arch) _lsn_cmp(x, y, arch) -#define XFS_LSN_CMP(x,y) XFS_LSN_CMP_ARCH(x,y,ARCH_NOCONVERT) -#define XFS_LSN_DIFF_ARCH(x,y,arch) _lsn_cmp(x, y, arch) -#define XFS_LSN_DIFF(x,y) XFS_LSN_DIFF_ARCH(x,y,ARCH_NOCONVERT) +#define XFS_LSN_CMP_ARCH(x,y,arch) _lsn_cmp(x, y, arch) +#define XFS_LSN_CMP(x,y) XFS_LSN_CMP_ARCH(x,y,ARCH_NOCONVERT) +#define XFS_LSN_DIFF_ARCH(x,y,arch) _lsn_cmp(x, y, arch) +#define XFS_LSN_DIFF(x,y) XFS_LSN_DIFF_ARCH(x,y,ARCH_NOCONVERT) /* * Macros, structures, prototypes for interface to the log manager. @@ -86,7 +86,7 @@ xfs_lsn_t _lsn_cmp(xfs_lsn_t lsn1, xfs_lsn_t lsn2, xfs_arch_t arch) /* * Flags to xfs_log_done() */ -#define XFS_LOG_REL_PERM_RESERV 0x1 +#define XFS_LOG_REL_PERM_RESERV 0x1 /* @@ -137,7 +137,7 @@ typedef void* xfs_log_ticket_t; * to the log manager. */ typedef struct xfs_log_callback { - struct xfs_log_callback *cb_next; + struct xfs_log_callback *cb_next; void (*cb_func)(void *, int); void *cb_arg; } xfs_log_callback_t; @@ -173,13 +173,13 @@ int xfs_log_reserve(struct xfs_mount *mp, __uint8_t clientid, uint flags); int xfs_log_write(struct xfs_mount *mp, - xfs_log_iovec_t region[], + xfs_log_iovec_t region[], int nentries, xfs_log_ticket_t ticket, xfs_lsn_t *start_lsn); int xfs_log_unmount(struct xfs_mount *mp); int xfs_log_unmount_write(struct xfs_mount *mp); -void xfs_log_unmount_dealloc(struct xfs_mount *mp); +void xfs_log_unmount_dealloc(struct xfs_mount *mp); int xfs_log_force_umount(struct xfs_mount *mp, int logerror); int xfs_log_need_covered(struct xfs_mount *mp); diff --git a/include/xfs_log_priv.h b/include/xfs_log_priv.h index 3fd8a12bc..37bcde28d 100644 --- a/include/xfs_log_priv.h +++ b/include/xfs_log_priv.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -29,11 +29,11 @@ * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ -#ifndef __XFS_LOG_PRIV_H__ +#ifndef __XFS_LOG_PRIV_H__ #define __XFS_LOG_PRIV_H__ #if defined(XFS_ALL_TRACE) -#define XFS_LOG_TRACE +#define XFS_LOG_TRACE #endif #if !defined(DEBUG) @@ -136,7 +136,7 @@ void xlog_grant_sub_space(struct log *log, int bytes, int type); if (type == 'w') { \ (log)->l_grant_write_bytes -= (bytes); \ if ((log)->l_grant_write_bytes < 0) { \ - (log)->l_grant_write_bytes += (log)->l_logsize; \ + (log)->l_grant_write_bytes += (log)->l_logsize; \ (log)->l_grant_write_cycle--; \ } \ } else { \ @@ -158,7 +158,7 @@ void xlog_grant_add_space(struct log *log, int bytes, int type); if (type == 'w') { \ (log)->l_grant_write_bytes += (bytes); \ if ((log)->l_grant_write_bytes > (log)->l_logsize) { \ - (log)->l_grant_write_bytes -= (log)->l_logsize; \ + (log)->l_grant_write_bytes -= (log)->l_logsize; \ (log)->l_grant_write_cycle++; \ } \ } else { \ @@ -259,7 +259,7 @@ void xlog_grant_add_space(struct log *log, int bytes, int type); */ #define XLOG_CHKSUM_MISMATCH 0x1 /* used only during recovery */ #define XLOG_ACTIVE_RECOVERY 0x2 /* in the middle of recovery */ -#define XLOG_RECOVERY_NEEDED 0x4 /* log was recovered */ +#define XLOG_RECOVERY_NEEDED 0x4 /* log was recovered */ #define XLOG_IO_ERROR 0x8 /* log hit an I/O error, and being shutdown */ typedef __uint32_t xlog_tid_t; @@ -343,11 +343,11 @@ typedef __uint32_t xlog_tid_t; typedef struct xlog_ticket { sv_t t_sema; /* sleep on this semaphore :20 */ - struct xlog_ticket *t_next; /* : 4 */ + struct xlog_ticket *t_next; /* : 4 */ struct xlog_ticket *t_prev; /* : 4 */ xlog_tid_t t_tid; /* transaction identifier : 4 */ int t_curr_res; /* current reservation in bytes : 4 */ - int t_unit_res; /* unit reservation in bytes : 4 */ + int t_unit_res; /* unit reservation in bytes : 4 */ __uint8_t t_ocnt; /* original count : 1 */ __uint8_t t_cnt; /* current count : 1 */ __uint8_t t_clientid; /* who does this belong to; : 1 */ @@ -359,7 +359,7 @@ typedef struct xlog_ticket { typedef struct xlog_op_header { xlog_tid_t oh_tid; /* transaction id of operation : 4 b */ int oh_len; /* bytes in data region : 4 b */ - __uint8_t oh_clientid; /* who sent me this : 1 b */ + __uint8_t oh_clientid; /* who sent me this : 1 b */ __uint8_t oh_flags; /* : 1 b */ ushort oh_res2; /* 32 bit align : 2 b */ } xlog_op_header_t; @@ -391,12 +391,12 @@ typedef struct xlog_rec_header { xfs_lsn_t h_tail_lsn; /* lsn of 1st LR w/ buffers not committed: 8 */ uint h_chksum; /* may not be used; non-zero if used : 4 */ int h_prev_block; /* block number to previous LR : 4 */ - int h_num_logops; /* number of log operations in this LR : 4 */ + int h_num_logops; /* number of log operations in this LR : 4 */ uint h_cycle_data[XLOG_HEADER_CYCLE_SIZE / BBSIZE]; /* new fields */ - int h_fmt; /* format of log record : 4 */ - uuid_t h_fs_uuid; /* uuid of FS : 16 */ - int h_size; /* iclog size : 4 */ + int h_fmt; /* format of log record : 4 */ + uuid_t h_fs_uuid; /* uuid of FS : 16 */ + int h_size; /* iclog size : 4 */ } xlog_rec_header_t; typedef struct xlog_rec_ext_header { @@ -405,7 +405,7 @@ typedef struct xlog_rec_ext_header { } xlog_rec_ext_header_t; #ifdef __KERNEL__ /* - * - A log record header is 512 bytes. There is plenty of room to grow the + * - A log record header is 512 bytes. There is plenty of room to grow the * xlog_rec_header_t into the reserved space. * - ic_data follows, so a write to disk can start at the beginning of * the iclog. @@ -457,21 +457,21 @@ typedef struct xlog_in_core { /* * Defines to save our code from this glop. */ -#define ic_forcesema hic_fields.ic_forcesema +#define ic_forcesema hic_fields.ic_forcesema #define ic_writesema hic_fields.ic_writesema -#define ic_next hic_fields.ic_next -#define ic_prev hic_fields.ic_prev -#define ic_bp hic_fields.ic_bp -#define ic_log hic_fields.ic_log -#define ic_callback hic_fields.ic_callback -#define ic_callback_tail hic_fields.ic_callback_tail -#define ic_trace hic_fields.ic_trace -#define ic_size hic_fields.ic_size -#define ic_offset hic_fields.ic_offset -#define ic_refcnt hic_fields.ic_refcnt -#define ic_roundoff hic_fields.ic_roundoff -#define ic_bwritecnt hic_fields.ic_bwritecnt -#define ic_state hic_fields.ic_state +#define ic_next hic_fields.ic_next +#define ic_prev hic_fields.ic_prev +#define ic_bp hic_fields.ic_bp +#define ic_log hic_fields.ic_log +#define ic_callback hic_fields.ic_callback +#define ic_callback_tail hic_fields.ic_callback_tail +#define ic_trace hic_fields.ic_trace +#define ic_size hic_fields.ic_size +#define ic_offset hic_fields.ic_offset +#define ic_refcnt hic_fields.ic_refcnt +#define ic_roundoff hic_fields.ic_roundoff +#define ic_bwritecnt hic_fields.ic_bwritecnt +#define ic_state hic_fields.ic_state #define ic_datap hic_fields.ic_datap #define ic_header hic_data->ic_h.hic_header @@ -483,29 +483,29 @@ typedef struct xlog_in_core { */ typedef struct log { /* The following block of fields are changed while holding icloglock */ - sema_t l_flushsema; /* iclog flushing semaphore */ + sema_t l_flushsema; /* iclog flushing semaphore */ int l_flushcnt; /* # of procs waiting on this sema */ int l_ticket_cnt; /* free ticket count */ int l_ticket_tcnt; /* total ticket count */ int l_covered_state;/* state of "covering disk log entries" */ - xlog_ticket_t *l_freelist; /* free list of tickets */ + xlog_ticket_t *l_freelist; /* free list of tickets */ xlog_ticket_t *l_unmount_free;/* kmem_free these addresses */ - xlog_ticket_t *l_tail; /* free list of tickets */ - xlog_in_core_t *l_iclog; /* head log queue */ - lock_t l_icloglock; /* grab to change iclog state */ - xfs_lsn_t l_tail_lsn; /* lsn of 1st LR w/ unflush buffers */ + xlog_ticket_t *l_tail; /* free list of tickets */ + xlog_in_core_t *l_iclog; /* head log queue */ + lock_t l_icloglock; /* grab to change iclog state */ + xfs_lsn_t l_tail_lsn; /* lsn of 1st LR w/ unflush buffers */ xfs_lsn_t l_last_sync_lsn;/* lsn of last LR on disk */ - struct xfs_mount *l_mp; /* mount point */ - struct xfs_buf *l_xbuf; /* extra buffer for log wrapping */ - dev_t l_dev; /* dev_t of log */ - xfs_daddr_t l_logBBstart; /* start block of log */ - int l_logsize; /* size of log in bytes */ - int l_logBBsize; /* size of log in 512 byte chunks */ + struct xfs_mount *l_mp; /* mount point */ + struct xfs_buf *l_xbuf; /* extra buffer for log wrapping */ + dev_t l_dev; /* dev_t of log */ + xfs_daddr_t l_logBBstart; /* start block of log */ + int l_logsize; /* size of log in bytes */ + int l_logBBsize; /* size of log in 512 byte chunks */ int l_roundoff; /* round off error of all iclogs */ - int l_curr_cycle; /* Cycle number of log writes */ - int l_prev_cycle; /* Cycle # b4 last block increment */ - int l_curr_block; /* current logical block of log */ - int l_prev_block; /* previous logical block of log */ + int l_curr_cycle; /* Cycle number of log writes */ + int l_prev_cycle; /* Cycle # b4 last block increment */ + int l_curr_block; /* current logical block of log */ + int l_prev_block; /* previous logical block of log */ int l_iclog_size; /* size of log in bytes */ int l_iclog_size_log;/* log power size of log */ int l_iclog_bufs; /* number of iclog buffers */ @@ -530,8 +530,8 @@ typedef struct log { uint l_flags; uint l_quotaoffs_flag;/* XFS_DQ_*, if QUOTAOFFs found */ struct xfs_buf_cancel **l_buf_cancel_table; - int l_iclog_hsize; /* size of iclog header */ - int l_iclog_heads; /* number of iclog header sectors */ + int l_iclog_hsize; /* size of iclog header */ + int l_iclog_heads; /* number of iclog header sectors */ } xlog_t; diff --git a/include/xfs_log_recover.h b/include/xfs_log_recover.h index b3bf72c1c..42158b442 100644 --- a/include/xfs_log_recover.h +++ b/include/xfs_log_recover.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -29,17 +29,17 @@ * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ -#ifndef __XFS_LOG_RECOVER_H__ +#ifndef __XFS_LOG_RECOVER_H__ #define __XFS_LOG_RECOVER_H__ /* * Macros, structures, prototypes for internal log manager use. */ -#define XLOG_RHASH_BITS 4 -#define XLOG_RHASH_SIZE 16 +#define XLOG_RHASH_BITS 4 +#define XLOG_RHASH_SIZE 16 #define XLOG_RHASH_SHIFT 2 -#define XLOG_RHASH(tid) \ +#define XLOG_RHASH(tid) \ ((((__uint32_t)tid)>>XLOG_RHASH_SHIFT) & (XLOG_RHASH_SIZE-1)) #define XLOG_MAX_REGIONS_IN_ITEM (XFS_MAX_BLOCKSIZE / XFS_BLI_CHUNK / 2 + 1) @@ -73,9 +73,9 @@ typedef struct xlog_recover { * This is the number of entries in the l_buf_cancel_table used during * recovery. */ -#define XLOG_BC_TABLE_SIZE 64 +#define XLOG_BC_TABLE_SIZE 64 -#define XLOG_RECOVER_PASS1 1 -#define XLOG_RECOVER_PASS2 2 +#define XLOG_RECOVER_PASS1 1 +#define XLOG_RECOVER_PASS2 2 #endif /* __XFS_LOG_RECOVER_H__ */ diff --git a/include/xfs_mac.h b/include/xfs_mac.h index 8a6179d9e..8d59aaffe 100644 --- a/include/xfs_mac.h +++ b/include/xfs_mac.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -40,23 +40,23 @@ * divisions (MINT). This is actually a header for the data structure which * will have an ml_list with more than one element. * - * ------------------------------- - * | ml_msen_type | ml_mint_type | - * ------------------------------- - * | ml_level | ml_grade | - * ------------------------------- - * | ml_catcount | - * ------------------------------- - * | ml_divcount | - * ------------------------------- - * | category 1 | - * | . . . | - * | category N | (where N = ml_catcount) - * ------------------------------- - * | division 1 | - * | . . . | - * | division M | (where M = ml_divcount) - * ------------------------------- + * ------------------------------- + * | ml_msen_type | ml_mint_type | + * ------------------------------- + * | ml_level | ml_grade | + * ------------------------------- + * | ml_catcount | + * ------------------------------- + * | ml_divcount | + * ------------------------------- + * | category 1 | + * | . . . | + * | category N | (where N = ml_catcount) + * ------------------------------- + * | division 1 | + * | . . . | + * | division M | (where M = ml_divcount) + * ------------------------------- */ #define XFS_MAC_MAX_SETS 250 typedef struct xfs_mac_label { @@ -70,18 +70,18 @@ typedef struct xfs_mac_label { __uint16_t ml_list[XFS_MAC_MAX_SETS]; } xfs_mac_label_t; -/* MSEN label type names. Choose an upper case ASCII character. */ +/* MSEN label type names. Choose an upper case ASCII character. */ #define XFS_MSEN_ADMIN_LABEL 'A' /* Admin: lowm_ail_lock) -#define AIL_UNLOCK(mp,s) mutex_spinunlock(&(mp)->m_ail_lock, s) +#define SPLDECL(s) unsigned long s +#define AIL_LOCK_T lock_t +#define AIL_LOCKINIT(x,y) spinlock_init(x,y) +#define AIL_LOCK_DESTROY(x) spinlock_destroy(x) +#define AIL_LOCK(mp,s) s=mutex_spinlock(&(mp)->m_ail_lock) +#define AIL_UNLOCK(mp,s) mutex_spinunlock(&(mp)->m_ail_lock, s) /* @@ -197,7 +197,7 @@ typedef struct xfs_qmops { /* * Prototypes and functions for I/O core modularization. */ - + typedef int (*xfs_ioinit_t)(struct vfs *, struct xfs_mount_args *, int); typedef int (*xfs_bmapi_t)(struct xfs_trans *, void *, @@ -315,7 +315,7 @@ typedef struct xfs_mount { xfs_buftarg_t *m_logdev_targp;/* ptr to log device */ xfs_buftarg_t *m_rtdev_targp; /* ptr to rt device */ #define m_dev m_ddev_targp->pbr_dev - __uint8_t m_dircook_elog; /* log d-cookie entry bits */ + __uint8_t m_dircook_elog; /* log d-cookie entry bits */ __uint8_t m_blkbit_log; /* blocklog + NBBY */ __uint8_t m_blkbb_log; /* blocklog - BBSHIFT */ __uint8_t m_agno_log; /* log #ag's */ @@ -325,19 +325,19 @@ typedef struct xfs_mount { uint m_blockmask; /* sb_blocksize-1 */ uint m_blockwsize; /* sb_blocksize in words */ uint m_blockwmask; /* blockwsize-1 */ - uint m_alloc_mxr[2]; /* XFS_ALLOC_BLOCK_MAXRECS */ - uint m_alloc_mnr[2]; /* XFS_ALLOC_BLOCK_MINRECS */ - uint m_bmap_dmxr[2]; /* XFS_BMAP_BLOCK_DMAXRECS */ - uint m_bmap_dmnr[2]; /* XFS_BMAP_BLOCK_DMINRECS */ - uint m_inobt_mxr[2]; /* XFS_INOBT_BLOCK_MAXRECS */ - uint m_inobt_mnr[2]; /* XFS_INOBT_BLOCK_MINRECS */ - uint m_ag_maxlevels; /* XFS_AG_MAXLEVELS */ + uint m_alloc_mxr[2]; /* XFS_ALLOC_BLOCK_MAXRECS */ + uint m_alloc_mnr[2]; /* XFS_ALLOC_BLOCK_MINRECS */ + uint m_bmap_dmxr[2]; /* XFS_BMAP_BLOCK_DMAXRECS */ + uint m_bmap_dmnr[2]; /* XFS_BMAP_BLOCK_DMINRECS */ + uint m_inobt_mxr[2]; /* XFS_INOBT_BLOCK_MAXRECS */ + uint m_inobt_mnr[2]; /* XFS_INOBT_BLOCK_MINRECS */ + uint m_ag_maxlevels; /* XFS_AG_MAXLEVELS */ uint m_bm_maxlevels[2]; /* XFS_BM_MAXLEVELS */ - uint m_in_maxlevels; /* XFS_IN_MAXLEVELS */ + uint m_in_maxlevels; /* XFS_IN_MAXLEVELS */ struct xfs_perag *m_perag; /* per-ag accounting info */ struct rw_semaphore m_peraglock; /* lock for m_perag (pointer) */ sema_t m_growlock; /* growfs mutex */ - int m_fixedfsid[2]; /* unchanged for life of FS */ + int m_fixedfsid[2]; /* unchanged for life of FS */ uint m_dmevmask; /* DMI events for this FS */ uint m_flags; /* global mount flags */ uint m_attroffset; /* inode attribute offset */ @@ -360,7 +360,7 @@ typedef struct xfs_mount { int m_lstripemask; /* log stripe mask */ int m_sinoalign; /* stripe unit inode alignmnt */ int m_attr_magicpct;/* 37% of the blocksize */ - int m_dir_magicpct; /* 37% of the dir blocksize */ + int m_dir_magicpct; /* 37% of the dir blocksize */ __uint8_t m_mk_sharedro; /* mark shared ro on unmount */ __uint8_t m_inode_quiesce;/* call quiesce on new inodes. field governed by m_ilock */ @@ -382,7 +382,7 @@ typedef struct xfs_mount { uint m_frozen; /* FS frozen for shutdown or * snapshot */ sv_t m_wait_unfreeze;/* waiting to unfreeze */ - atomic_t m_active_trans; /* number trans frozen */ + atomic_t m_active_trans; /* number trans frozen */ struct timer_list m_sbdirty_timer;/* superblock dirty timer * for nfs refcache */ } xfs_mount_t; @@ -390,11 +390,11 @@ typedef struct xfs_mount { /* * Flags for m_flags. */ -#define XFS_MOUNT_WSYNC 0x00000001 /* for nfs - all metadata ops +#define XFS_MOUNT_WSYNC 0x00000001 /* for nfs - all metadata ops must be synchronous except for space allocations */ #if XFS_BIG_FILESYSTEMS -#define XFS_MOUNT_INO64 0x00000002 +#define XFS_MOUNT_INO64 0x00000002 #endif /* 0x00000004 -- currently unused */ /* 0x00000008 -- currently unused */ @@ -403,12 +403,12 @@ typedef struct xfs_mount { disk errors in metadata */ #define XFS_MOUNT_NOATIME 0x00000020 /* don't modify inode access times on reads */ -#define XFS_MOUNT_RETERR 0x00000040 /* return alignment errors to +#define XFS_MOUNT_RETERR 0x00000040 /* return alignment errors to user */ #define XFS_MOUNT_NOALIGN 0x00000080 /* turn off stripe alignment allocations */ /* 0x00000100 -- currently unused */ - /* 0x00000200 -- currently unused */ + /* 0x00000200 -- currently unused */ #define XFS_MOUNT_NORECOVERY 0x00000400 /* no recovery - dirty fs */ #define XFS_MOUNT_SHARED 0x00000800 /* shared mount */ #define XFS_MOUNT_DFLT_IOSIZE 0x00001000 /* set default i/o size */ @@ -419,7 +419,7 @@ typedef struct xfs_mount { * 32 bits in size */ #define XFS_MOUNT_NOLOGFLUSH 0x00010000 -#define XFS_FORCED_SHUTDOWN(mp) ((mp)->m_flags & XFS_MOUNT_FS_SHUTDOWN) +#define XFS_FORCED_SHUTDOWN(mp) ((mp)->m_flags & XFS_MOUNT_FS_SHUTDOWN) /* * Default minimum read and write sizes. @@ -433,7 +433,7 @@ typedef struct xfs_mount { /* * Max and min values for UIO and mount-option defined I/O sizes; - * min value can't be less than a page. Currently unused. + * min value can't be less than a page. Currently unused. */ #define XFS_MAX_IO_LOG 16 /* 64K */ #define XFS_MIN_IO_LOG PAGE_SHIFT @@ -442,8 +442,8 @@ typedef struct xfs_mount { * Synchronous read and write sizes. This should be * better for NFSv2 wsync filesystems. */ -#define XFS_WSYNC_READIO_LOG 15 /* 32K */ -#define XFS_WSYNC_WRITEIO_LOG 14 /* 16K */ +#define XFS_WSYNC_READIO_LOG 15 /* 32K */ +#define XFS_WSYNC_WRITEIO_LOG 14 /* 16K */ #define xfs_force_shutdown(m,f) \ VFS_FORCE_SHUTDOWN((XFS_MTOVFS(m)), f, __FILE__, __LINE__) @@ -475,13 +475,13 @@ typedef struct xfs_mount { */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_MTOVFS) struct vfs *xfs_mtovfs(xfs_mount_t *mp); -#define XFS_MTOVFS(mp) xfs_mtovfs(mp) +#define XFS_MTOVFS(mp) xfs_mtovfs(mp) #else -#define XFS_MTOVFS(mp) (bhvtovfs(&(mp)->m_bhv)) +#define XFS_MTOVFS(mp) (bhvtovfs(&(mp)->m_bhv)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_BHVTOM) xfs_mount_t *xfs_bhvtom(bhv_desc_t *bdp); -#define XFS_BHVTOM(bdp) xfs_bhvtom(bdp) +#define XFS_BHVTOM(bdp) xfs_bhvtom(bdp) #else #define XFS_BHVTOM(bdp) ((xfs_mount_t *)BHV_PDATA(bdp)) #endif @@ -500,7 +500,7 @@ xfs_mount_t *xfs_vfstom(vfs_t *vfs); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DADDR_TO_AGNO) xfs_agnumber_t xfs_daddr_to_agno(struct xfs_mount *mp, xfs_daddr_t d); -#define XFS_DADDR_TO_AGNO(mp,d) xfs_daddr_to_agno(mp,d) +#define XFS_DADDR_TO_AGNO(mp,d) xfs_daddr_to_agno(mp,d) #else static inline xfs_agnumber_t XFS_DADDR_TO_AGNO(xfs_mount_t *mp, xfs_daddr_t d) @@ -513,7 +513,7 @@ static inline xfs_agnumber_t XFS_DADDR_TO_AGNO(xfs_mount_t *mp, xfs_daddr_t d) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DADDR_TO_AGBNO) xfs_agblock_t xfs_daddr_to_agbno(struct xfs_mount *mp, xfs_daddr_t d); -#define XFS_DADDR_TO_AGBNO(mp,d) xfs_daddr_to_agbno(mp,d) +#define XFS_DADDR_TO_AGBNO(mp,d) xfs_daddr_to_agbno(mp,d) #else static inline xfs_agblock_t XFS_DADDR_TO_AGBNO(xfs_mount_t *mp, xfs_daddr_t d) @@ -532,10 +532,10 @@ typedef struct xfs_mod_sb { int msb_delta; /* Change to make to specified field */ } xfs_mod_sb_t; -#define XFS_MOUNT_ILOCK(mp) mutex_lock(&((mp)->m_ilock), PINOD) -#define XFS_MOUNT_IUNLOCK(mp) mutex_unlock(&((mp)->m_ilock)) -#define XFS_SB_LOCK(mp) mutex_spinlock(&(mp)->m_sb_lock) -#define XFS_SB_UNLOCK(mp,s) mutex_spinunlock(&(mp)->m_sb_lock,(s)) +#define XFS_MOUNT_ILOCK(mp) mutex_lock(&((mp)->m_ilock), PINOD) +#define XFS_MOUNT_IUNLOCK(mp) mutex_unlock(&((mp)->m_ilock)) +#define XFS_SB_LOCK(mp) mutex_spinlock(&(mp)->m_sb_lock) +#define XFS_SB_UNLOCK(mp,s) mutex_spinunlock(&(mp)->m_sb_lock,(s)) extern xfs_mount_t *xfs_mount_init(void); extern void xfs_mod_sb(xfs_trans_t *, __int64_t); @@ -575,7 +575,7 @@ extern struct xfs_dmops xfs_dmcore_xfs; extern struct xfs_qmops xfs_qmcore_xfs; extern struct xfs_ioops xfs_iocore_xfs; -extern int xfs_init(void); +extern int xfs_init(void); extern void xfs_cleanup(void); #endif /* __KERNEL__ */ diff --git a/include/xfs_quota.h b/include/xfs_quota.h index 57c2bb304..d7041e5ac 100644 --- a/include/xfs_quota.h +++ b/include/xfs_quota.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -149,21 +149,21 @@ typedef struct xfs_qoff_logformat { /* * Disk quotas status in m_qflags, and also sb_qflags. 16 bits. */ -#define XFS_UQUOTA_ACCT 0x0001 /* user quota accounting ON */ -#define XFS_UQUOTA_ENFD 0x0002 /* user quota limits enforced */ -#define XFS_UQUOTA_CHKD 0x0004 /* quotacheck run on usr quotas */ -#define XFS_PQUOTA_ACCT 0x0008 /* (IRIX) project quota accounting ON */ -#define XFS_GQUOTA_ENFD 0x0010 /* group quota limits enforced */ -#define XFS_GQUOTA_CHKD 0x0020 /* quotacheck run on grp quotas */ -#define XFS_GQUOTA_ACCT 0x0040 /* group quota accounting ON */ +#define XFS_UQUOTA_ACCT 0x0001 /* user quota accounting ON */ +#define XFS_UQUOTA_ENFD 0x0002 /* user quota limits enforced */ +#define XFS_UQUOTA_CHKD 0x0004 /* quotacheck run on usr quotas */ +#define XFS_PQUOTA_ACCT 0x0008 /* (IRIX) project quota accounting ON */ +#define XFS_GQUOTA_ENFD 0x0010 /* group quota limits enforced */ +#define XFS_GQUOTA_CHKD 0x0020 /* quotacheck run on grp quotas */ +#define XFS_GQUOTA_ACCT 0x0040 /* group quota accounting ON */ /* * Incore only flags for quotaoff - these bits get cleared when quota(s) * are in the process of getting turned off. These flags are in m_qflags but * never in sb_qflags. */ -#define XFS_UQUOTA_ACTIVE 0x0080 /* uquotas are being turned off */ -#define XFS_GQUOTA_ACTIVE 0x0100 /* gquotas are being turned off */ +#define XFS_UQUOTA_ACTIVE 0x0080 /* uquotas are being turned off */ +#define XFS_GQUOTA_ACTIVE 0x0100 /* gquotas are being turned off */ /* * Checking XFS_IS_*QUOTA_ON() while holding any inode lock guarantees @@ -189,7 +189,7 @@ typedef struct xfs_qoff_logformat { #define XFS_QMOPT_QUOTAOFF 0x0000080 /* quotas are being turned off */ #define XFS_QMOPT_UMOUNTING 0x0000100 /* filesys is being unmounted */ #define XFS_QMOPT_DOLOG 0x0000200 /* log buf changes (in quotacheck) */ -#define XFS_QMOPT_DOWARN 0x0000400 /* increase warning cnt if necessary */ +#define XFS_QMOPT_DOWARN 0x0000400 /* increase warning cnt if necessary */ #define XFS_QMOPT_ILOCKED 0x0000800 /* inode is already locked (excl) */ #define XFS_QMOPT_DQREPAIR 0x0001000 /* repair dquot, if damaged. */ @@ -222,7 +222,7 @@ typedef struct xfs_qoff_logformat { * flags to xfs_trans_mod_dquot. */ #define XFS_TRANS_DQ_RES_BLKS XFS_QMOPT_RES_REGBLKS -#define XFS_TRANS_DQ_RES_RTBLKS XFS_QMOPT_RES_RTBLKS +#define XFS_TRANS_DQ_RES_RTBLKS XFS_QMOPT_RES_RTBLKS #define XFS_TRANS_DQ_RES_INOS XFS_QMOPT_RES_INOS #define XFS_TRANS_DQ_BCOUNT XFS_QMOPT_BCOUNT #define XFS_TRANS_DQ_DELBCOUNT XFS_QMOPT_DELBCOUNT diff --git a/include/xfs_rtalloc.h b/include/xfs_rtalloc.h index 19e704107..1e0f0a7cc 100644 --- a/include/xfs_rtalloc.h +++ b/include/xfs_rtalloc.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_RTALLOC_H__ -#define __XFS_RTALLOC_H__ +#define __XFS_RTALLOC_H__ struct xfs_mount; struct xfs_trans; @@ -38,49 +38,49 @@ struct xfs_trans; #define XFS_IS_REALTIME_INODE(ip) ((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME) /* Min and max rt extent sizes, specified in bytes */ -#define XFS_MAX_RTEXTSIZE (1024 * 1024 * 1024) /* 1GB */ -#define XFS_DFL_RTEXTSIZE (64 * 1024) /* 64KB */ -#define XFS_MIN_RTEXTSIZE (4 * 1024) /* 4KB */ +#define XFS_MAX_RTEXTSIZE (1024 * 1024 * 1024) /* 1GB */ +#define XFS_DFL_RTEXTSIZE (64 * 1024) /* 64KB */ +#define XFS_MIN_RTEXTSIZE (4 * 1024) /* 4KB */ /* * Constants for bit manipulations. */ -#define XFS_NBBYLOG 3 /* log2(NBBY) */ -#define XFS_WORDLOG 2 /* log2(sizeof(xfs_rtword_t)) */ -#define XFS_NBWORDLOG (XFS_NBBYLOG + XFS_WORDLOG) -#define XFS_NBWORD (1 << XFS_NBWORDLOG) -#define XFS_WORDMASK ((1 << XFS_WORDLOG) - 1) +#define XFS_NBBYLOG 3 /* log2(NBBY) */ +#define XFS_WORDLOG 2 /* log2(sizeof(xfs_rtword_t)) */ +#define XFS_NBWORDLOG (XFS_NBBYLOG + XFS_WORDLOG) +#define XFS_NBWORD (1 << XFS_NBWORDLOG) +#define XFS_WORDMASK ((1 << XFS_WORDLOG) - 1) -#define XFS_BLOCKSIZE(mp) ((mp)->m_sb.sb_blocksize) -#define XFS_BLOCKMASK(mp) ((mp)->m_blockmask) -#define XFS_BLOCKWSIZE(mp) ((mp)->m_blockwsize) -#define XFS_BLOCKWMASK(mp) ((mp)->m_blockwmask) +#define XFS_BLOCKSIZE(mp) ((mp)->m_sb.sb_blocksize) +#define XFS_BLOCKMASK(mp) ((mp)->m_blockmask) +#define XFS_BLOCKWSIZE(mp) ((mp)->m_blockwsize) +#define XFS_BLOCKWMASK(mp) ((mp)->m_blockwmask) /* * Summary and bit manipulation macros. */ -#define XFS_SUMOFFS(mp,ls,bb) ((int)((ls) * (mp)->m_sb.sb_rbmblocks + (bb))) -#define XFS_SUMOFFSTOBLOCK(mp,s) \ +#define XFS_SUMOFFS(mp,ls,bb) ((int)((ls) * (mp)->m_sb.sb_rbmblocks + (bb))) +#define XFS_SUMOFFSTOBLOCK(mp,s) \ (((s) * (uint)sizeof(xfs_suminfo_t)) >> (mp)->m_sb.sb_blocklog) -#define XFS_SUMPTR(mp,bp,so) \ +#define XFS_SUMPTR(mp,bp,so) \ ((xfs_suminfo_t *)((char *)XFS_BUF_PTR(bp) + \ (((so) * (uint)sizeof(xfs_suminfo_t)) & XFS_BLOCKMASK(mp)))) -#define XFS_BITTOBLOCK(mp,bi) ((bi) >> (mp)->m_blkbit_log) -#define XFS_BLOCKTOBIT(mp,bb) ((bb) << (mp)->m_blkbit_log) -#define XFS_BITTOWORD(mp,bi) \ +#define XFS_BITTOBLOCK(mp,bi) ((bi) >> (mp)->m_blkbit_log) +#define XFS_BLOCKTOBIT(mp,bb) ((bb) << (mp)->m_blkbit_log) +#define XFS_BITTOWORD(mp,bi) \ ((int)(((bi) >> XFS_NBWORDLOG) & XFS_BLOCKWMASK(mp))) -#define XFS_RTMIN(a,b) ((a) < (b) ? (a) : (b)) -#define XFS_RTMAX(a,b) ((a) > (b) ? (a) : (b)) +#define XFS_RTMIN(a,b) ((a) < (b) ? (a) : (b)) +#define XFS_RTMAX(a,b) ((a) > (b) ? (a) : (b)) -#define XFS_RTLOBIT(w) xfs_lowbit32(w) -#define XFS_RTHIBIT(w) xfs_highbit32(w) +#define XFS_RTLOBIT(w) xfs_lowbit32(w) +#define XFS_RTHIBIT(w) xfs_highbit32(w) #if XFS_BIG_FILESYSTEMS -#define XFS_RTBLOCKLOG(b) xfs_highbit64(b) +#define XFS_RTBLOCKLOG(b) xfs_highbit64(b) #else -#define XFS_RTBLOCKLOG(b) xfs_highbit32(b) +#define XFS_RTBLOCKLOG(b) xfs_highbit32(b) #endif @@ -93,18 +93,18 @@ struct xfs_trans; /* * Allocate an extent in the realtime subvolume, with the usual allocation - * parameters. The length units are all in realtime extents, as is the + * parameters. The length units are all in realtime extents, as is the * result block number. */ int /* error */ xfs_rtallocate_extent( struct xfs_trans *tp, /* transaction pointer */ xfs_rtblock_t bno, /* starting block number to allocate */ - xfs_extlen_t minlen, /* minimum length to allocate */ - xfs_extlen_t maxlen, /* maximum length to allocate */ + xfs_extlen_t minlen, /* minimum length to allocate */ + xfs_extlen_t maxlen, /* maximum length to allocate */ xfs_extlen_t *len, /* out: actual length allocated */ xfs_alloctype_t type, /* allocation type XFS_ALLOCTYPE... */ - int wasdel, /* was a delayed allocation extent */ + int wasdel, /* was a delayed allocation extent */ xfs_extlen_t prod, /* extent product factor */ xfs_rtblock_t *rtblock); /* out: start block allocated */ @@ -145,7 +145,7 @@ xfs_rtpick_extent( struct xfs_mount *mp, /* file system mount point */ struct xfs_trans *tp, /* transaction pointer */ xfs_extlen_t len, /* allocation length (rtextents) */ - xfs_rtblock_t *pick); /* result rt extent */ + xfs_rtblock_t *pick); /* result rt extent */ /* * Debug code: print out the value of a range in the bitmap. @@ -174,12 +174,12 @@ xfs_growfs_rt( xfs_growfs_rt_t *in); /* user supplied growfs struct */ #else -# define xfs_rtallocate_extent(t,b,min,max,l,a,f,p,rb) (ENOSYS) -# define xfs_rtfree_extent(t,b,l) (ENOSYS) -# define xfs_rtpick_extent(m,t,l,rb) (ENOSYS) -# define xfs_growfs_rt(mp,in) (ENOSYS) -# define xfs_rtmount_init(m) (((mp)->m_sb.sb_rblocks == 0)? 0 : (ENOSYS)) -# define xfs_rtmount_inodes(m) (((mp)->m_sb.sb_rblocks == 0)? 0 : (ENOSYS)) +# define xfs_rtallocate_extent(t,b,min,max,l,a,f,p,rb) (ENOSYS) +# define xfs_rtfree_extent(t,b,l) (ENOSYS) +# define xfs_rtpick_extent(m,t,l,rb) (ENOSYS) +# define xfs_growfs_rt(mp,in) (ENOSYS) +# define xfs_rtmount_init(m) (((mp)->m_sb.sb_rblocks == 0)? 0 : (ENOSYS)) +# define xfs_rtmount_inodes(m) (((mp)->m_sb.sb_rblocks == 0)? 0 : (ENOSYS)) #endif /* CONFIG_XFS_RT */ #endif /* __KERNEL__ */ diff --git a/include/xfs_sb.h b/include/xfs_sb.h index bc05f8026..f0dea2a84 100644 --- a/include/xfs_sb.h +++ b/include/xfs_sb.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_SB_H__ -#define __XFS_SB_H__ +#define __XFS_SB_H__ /* * Super block @@ -41,29 +41,29 @@ struct xfs_buf; struct xfs_mount; -#define XFS_SB_MAGIC 0x58465342 /* 'XFSB' */ -#define XFS_SB_VERSION_1 1 /* 5.3, 6.0.1, 6.1 */ -#define XFS_SB_VERSION_2 2 /* 6.2 - attributes */ -#define XFS_SB_VERSION_3 3 /* 6.2 - new inode version */ -#define XFS_SB_VERSION_4 4 /* 6.2+ - bitmask version */ -#define XFS_SB_VERSION_NUMBITS 0x000f -#define XFS_SB_VERSION_ALLFBITS 0xfff0 -#define XFS_SB_VERSION_SASHFBITS 0xf000 -#define XFS_SB_VERSION_REALFBITS 0x0ff0 -#define XFS_SB_VERSION_ATTRBIT 0x0010 -#define XFS_SB_VERSION_NLINKBIT 0x0020 -#define XFS_SB_VERSION_QUOTABIT 0x0040 -#define XFS_SB_VERSION_ALIGNBIT 0x0080 -#define XFS_SB_VERSION_DALIGNBIT 0x0100 -#define XFS_SB_VERSION_SHAREDBIT 0x0200 +#define XFS_SB_MAGIC 0x58465342 /* 'XFSB' */ +#define XFS_SB_VERSION_1 1 /* 5.3, 6.0.1, 6.1 */ +#define XFS_SB_VERSION_2 2 /* 6.2 - attributes */ +#define XFS_SB_VERSION_3 3 /* 6.2 - new inode version */ +#define XFS_SB_VERSION_4 4 /* 6.2+ - bitmask version */ +#define XFS_SB_VERSION_NUMBITS 0x000f +#define XFS_SB_VERSION_ALLFBITS 0xfff0 +#define XFS_SB_VERSION_SASHFBITS 0xf000 +#define XFS_SB_VERSION_REALFBITS 0x0ff0 +#define XFS_SB_VERSION_ATTRBIT 0x0010 +#define XFS_SB_VERSION_NLINKBIT 0x0020 +#define XFS_SB_VERSION_QUOTABIT 0x0040 +#define XFS_SB_VERSION_ALIGNBIT 0x0080 +#define XFS_SB_VERSION_DALIGNBIT 0x0100 +#define XFS_SB_VERSION_SHAREDBIT 0x0200 #define XFS_SB_VERSION_LOGV2BIT 0x0400 #define XFS_SB_VERSION_SECTORBIT 0x0800 -#define XFS_SB_VERSION_EXTFLGBIT 0x1000 -#define XFS_SB_VERSION_DIRV2BIT 0x2000 -#define XFS_SB_VERSION_OKSASHFBITS \ +#define XFS_SB_VERSION_EXTFLGBIT 0x1000 +#define XFS_SB_VERSION_DIRV2BIT 0x2000 +#define XFS_SB_VERSION_OKSASHFBITS \ (XFS_SB_VERSION_EXTFLGBIT | \ XFS_SB_VERSION_DIRV2BIT) -#define XFS_SB_VERSION_OKREALFBITS \ +#define XFS_SB_VERSION_OKREALFBITS \ (XFS_SB_VERSION_ATTRBIT | \ XFS_SB_VERSION_NLINKBIT | \ XFS_SB_VERSION_QUOTABIT | \ @@ -72,11 +72,11 @@ struct xfs_mount; XFS_SB_VERSION_SHAREDBIT | \ XFS_SB_VERSION_LOGV2BIT | \ XFS_SB_VERSION_SECTORBIT) -#define XFS_SB_VERSION_OKSASHBITS \ +#define XFS_SB_VERSION_OKSASHBITS \ (XFS_SB_VERSION_NUMBITS | \ XFS_SB_VERSION_REALFBITS | \ XFS_SB_VERSION_OKSASHFBITS) -#define XFS_SB_VERSION_OKREALBITS \ +#define XFS_SB_VERSION_OKREALBITS \ (XFS_SB_VERSION_NUMBITS | \ XFS_SB_VERSION_OKREALFBITS | \ XFS_SB_VERSION_OKSASHFBITS) @@ -123,7 +123,7 @@ typedef struct xfs_sb __uint8_t sb_imax_pct; /* max % of fs for inode space */ /* statistics */ /* - * These fields must remain contiguous. If you really + * These fields must remain contiguous. If you really * want to change their layout, make sure you fix the * code in xfs_trans_apply_sb_deltas(). */ @@ -171,22 +171,22 @@ typedef enum { * Mask values, defined based on the xfs_sb_field_t values. * Only define the ones we're using. */ -#define XFS_SB_MVAL(x) (1LL << XFS_SBS_ ## x) -#define XFS_SB_UUID XFS_SB_MVAL(UUID) -#define XFS_SB_FNAME XFS_SB_MVAL(FNAME) -#define XFS_SB_ROOTINO XFS_SB_MVAL(ROOTINO) -#define XFS_SB_RBMINO XFS_SB_MVAL(RBMINO) -#define XFS_SB_RSUMINO XFS_SB_MVAL(RSUMINO) -#define XFS_SB_VERSIONNUM XFS_SB_MVAL(VERSIONNUM) +#define XFS_SB_MVAL(x) (1LL << XFS_SBS_ ## x) +#define XFS_SB_UUID XFS_SB_MVAL(UUID) +#define XFS_SB_FNAME XFS_SB_MVAL(FNAME) +#define XFS_SB_ROOTINO XFS_SB_MVAL(ROOTINO) +#define XFS_SB_RBMINO XFS_SB_MVAL(RBMINO) +#define XFS_SB_RSUMINO XFS_SB_MVAL(RSUMINO) +#define XFS_SB_VERSIONNUM XFS_SB_MVAL(VERSIONNUM) #define XFS_SB_UQUOTINO XFS_SB_MVAL(UQUOTINO) #define XFS_SB_GQUOTINO XFS_SB_MVAL(GQUOTINO) #define XFS_SB_QFLAGS XFS_SB_MVAL(QFLAGS) #define XFS_SB_SHARED_VN XFS_SB_MVAL(SHARED_VN) #define XFS_SB_UNIT XFS_SB_MVAL(UNIT) #define XFS_SB_WIDTH XFS_SB_MVAL(WIDTH) -#define XFS_SB_NUM_BITS ((int)XFS_SBS_FIELDCOUNT) -#define XFS_SB_ALL_BITS ((1LL << XFS_SB_NUM_BITS) - 1) -#define XFS_SB_MOD_BITS \ +#define XFS_SB_NUM_BITS ((int)XFS_SBS_FIELDCOUNT) +#define XFS_SB_ALL_BITS ((1LL << XFS_SB_NUM_BITS) - 1) +#define XFS_SB_MOD_BITS \ (XFS_SB_UUID | XFS_SB_ROOTINO | XFS_SB_RBMINO | XFS_SB_RSUMINO | \ XFS_SB_VERSIONNUM | XFS_SB_UQUOTINO | XFS_SB_GQUOTINO | \ XFS_SB_QFLAGS | XFS_SB_SHARED_VN | XFS_SB_UNIT | XFS_SB_WIDTH) @@ -205,22 +205,22 @@ typedef enum { #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_SB_VERSION_NUM) int xfs_sb_version_num(xfs_sb_t *sbp); -#define XFS_SB_VERSION_NUM(sbp) xfs_sb_version_num(sbp) +#define XFS_SB_VERSION_NUM(sbp) xfs_sb_version_num(sbp) #else -#define XFS_SB_VERSION_NUM(sbp) ((sbp)->sb_versionnum & XFS_SB_VERSION_NUMBITS) +#define XFS_SB_VERSION_NUM(sbp) ((sbp)->sb_versionnum & XFS_SB_VERSION_NUMBITS) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_SB_GOOD_VERSION) int xfs_sb_good_version(xfs_sb_t *sbp); -#define XFS_SB_GOOD_VERSION(sbp) xfs_sb_good_version(sbp) +#define XFS_SB_GOOD_VERSION(sbp) xfs_sb_good_version(sbp) #else -#define XFS_SB_GOOD_VERSION_INT(sbp) \ +#define XFS_SB_GOOD_VERSION_INT(sbp) \ ((((sbp)->sb_versionnum >= XFS_SB_VERSION_1) && \ ((sbp)->sb_versionnum <= XFS_SB_VERSION_3)) || \ ((XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ !((sbp)->sb_versionnum & ~XFS_SB_VERSION_OKREALBITS) #ifdef __KERNEL__ -#define XFS_SB_GOOD_VERSION(sbp) \ +#define XFS_SB_GOOD_VERSION(sbp) \ (XFS_SB_GOOD_VERSION_INT(sbp) && \ (sbp)->sb_shared_vn <= XFS_SB_MAX_SHARED_VN) )) #else @@ -237,7 +237,7 @@ int xfs_sb_good_version(xfs_sb_t *sbp); #endif /* __KERNEL__ */ #endif -#define XFS_SB_GOOD_SASH_VERSION(sbp) \ +#define XFS_SB_GOOD_SASH_VERSION(sbp) \ ((((sbp)->sb_versionnum >= XFS_SB_VERSION_1) && \ ((sbp)->sb_versionnum <= XFS_SB_VERSION_3)) || \ ((XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ @@ -245,9 +245,9 @@ int xfs_sb_good_version(xfs_sb_t *sbp); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_SB_VERSION_TONEW) unsigned xfs_sb_version_tonew(unsigned v); -#define XFS_SB_VERSION_TONEW(v) xfs_sb_version_tonew(v) +#define XFS_SB_VERSION_TONEW(v) xfs_sb_version_tonew(v) #else -#define XFS_SB_VERSION_TONEW(v) \ +#define XFS_SB_VERSION_TONEW(v) \ ((((v) == XFS_SB_VERSION_1) ? \ 0 : \ (((v) == XFS_SB_VERSION_2) ? \ @@ -258,9 +258,9 @@ unsigned xfs_sb_version_tonew(unsigned v); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_SB_VERSION_TOOLD) unsigned xfs_sb_version_toold(unsigned v); -#define XFS_SB_VERSION_TOOLD(v) xfs_sb_version_toold(v) +#define XFS_SB_VERSION_TOOLD(v) xfs_sb_version_toold(v) #else -#define XFS_SB_VERSION_TOOLD(v) \ +#define XFS_SB_VERSION_TOOLD(v) \ (((v) & (XFS_SB_VERSION_QUOTABIT | XFS_SB_VERSION_ALIGNBIT)) ? \ 0 : \ (((v) & XFS_SB_VERSION_NLINKBIT) ? \ @@ -272,9 +272,9 @@ unsigned xfs_sb_version_toold(unsigned v); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_SB_VERSION_HASATTR) int xfs_sb_version_hasattr(xfs_sb_t *sbp); -#define XFS_SB_VERSION_HASATTR(sbp) xfs_sb_version_hasattr(sbp) +#define XFS_SB_VERSION_HASATTR(sbp) xfs_sb_version_hasattr(sbp) #else -#define XFS_SB_VERSION_HASATTR(sbp) \ +#define XFS_SB_VERSION_HASATTR(sbp) \ (((sbp)->sb_versionnum == XFS_SB_VERSION_2) || \ ((sbp)->sb_versionnum == XFS_SB_VERSION_3) || \ ((XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ @@ -283,9 +283,9 @@ int xfs_sb_version_hasattr(xfs_sb_t *sbp); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_SB_VERSION_ADDATTR) void xfs_sb_version_addattr(xfs_sb_t *sbp); -#define XFS_SB_VERSION_ADDATTR(sbp) xfs_sb_version_addattr(sbp) +#define XFS_SB_VERSION_ADDATTR(sbp) xfs_sb_version_addattr(sbp) #else -#define XFS_SB_VERSION_ADDATTR(sbp) \ +#define XFS_SB_VERSION_ADDATTR(sbp) \ ((sbp)->sb_versionnum = \ (((sbp)->sb_versionnum == XFS_SB_VERSION_1) ? \ XFS_SB_VERSION_2 : \ @@ -296,9 +296,9 @@ void xfs_sb_version_addattr(xfs_sb_t *sbp); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_SB_VERSION_HASNLINK) int xfs_sb_version_hasnlink(xfs_sb_t *sbp); -#define XFS_SB_VERSION_HASNLINK(sbp) xfs_sb_version_hasnlink(sbp) +#define XFS_SB_VERSION_HASNLINK(sbp) xfs_sb_version_hasnlink(sbp) #else -#define XFS_SB_VERSION_HASNLINK(sbp) \ +#define XFS_SB_VERSION_HASNLINK(sbp) \ (((sbp)->sb_versionnum == XFS_SB_VERSION_3) || \ ((XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ ((sbp)->sb_versionnum & XFS_SB_VERSION_NLINKBIT))) @@ -306,9 +306,9 @@ int xfs_sb_version_hasnlink(xfs_sb_t *sbp); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_SB_VERSION_ADDNLINK) void xfs_sb_version_addnlink(xfs_sb_t *sbp); -#define XFS_SB_VERSION_ADDNLINK(sbp) xfs_sb_version_addnlink(sbp) +#define XFS_SB_VERSION_ADDNLINK(sbp) xfs_sb_version_addnlink(sbp) #else -#define XFS_SB_VERSION_ADDNLINK(sbp) \ +#define XFS_SB_VERSION_ADDNLINK(sbp) \ ((sbp)->sb_versionnum = \ ((sbp)->sb_versionnum <= XFS_SB_VERSION_2 ? \ XFS_SB_VERSION_3 : \ @@ -317,18 +317,18 @@ void xfs_sb_version_addnlink(xfs_sb_t *sbp); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_SB_VERSION_HASQUOTA) int xfs_sb_version_hasquota(xfs_sb_t *sbp); -#define XFS_SB_VERSION_HASQUOTA(sbp) xfs_sb_version_hasquota(sbp) +#define XFS_SB_VERSION_HASQUOTA(sbp) xfs_sb_version_hasquota(sbp) #else -#define XFS_SB_VERSION_HASQUOTA(sbp) \ +#define XFS_SB_VERSION_HASQUOTA(sbp) \ ((XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ ((sbp)->sb_versionnum & XFS_SB_VERSION_QUOTABIT)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_SB_VERSION_ADDQUOTA) void xfs_sb_version_addquota(xfs_sb_t *sbp); -#define XFS_SB_VERSION_ADDQUOTA(sbp) xfs_sb_version_addquota(sbp) +#define XFS_SB_VERSION_ADDQUOTA(sbp) xfs_sb_version_addquota(sbp) #else -#define XFS_SB_VERSION_ADDQUOTA(sbp) \ +#define XFS_SB_VERSION_ADDQUOTA(sbp) \ ((sbp)->sb_versionnum = \ (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4 ? \ ((sbp)->sb_versionnum | XFS_SB_VERSION_QUOTABIT) : \ @@ -338,18 +338,18 @@ void xfs_sb_version_addquota(xfs_sb_t *sbp); #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_SB_VERSION_HASALIGN) int xfs_sb_version_hasalign(xfs_sb_t *sbp); -#define XFS_SB_VERSION_HASALIGN(sbp) xfs_sb_version_hasalign(sbp) +#define XFS_SB_VERSION_HASALIGN(sbp) xfs_sb_version_hasalign(sbp) #else -#define XFS_SB_VERSION_HASALIGN(sbp) \ +#define XFS_SB_VERSION_HASALIGN(sbp) \ ((XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_4) && \ ((sbp)->sb_versionnum & XFS_SB_VERSION_ALIGNBIT)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_SB_VERSION_SUBALIGN) void xfs_sb_version_subalign(xfs_sb_t *sbp); -#define XFS_SB_VERSION_SUBALIGN(sbp) xfs_sb_version_subalign(sbp) +#define XFS_SB_VERSION_SUBALIGN(sbp) xfs_sb_version_subalign(sbp) #else -#define XFS_SB_VERSION_SUBALIGN(sbp) \ +#define XFS_SB_VERSION_SUBALIGN(sbp) \ ((sbp)->sb_versionnum = \ XFS_SB_VERSION_TOOLD((sbp)->sb_versionnum & ~XFS_SB_VERSION_ALIGNBIT)) #endif @@ -460,29 +460,29 @@ int xfs_sb_version_hassector(xfs_sb_t *sbp); #define XFS_SB_DADDR ((xfs_daddr_t)0) /* daddr in filesystem/ag */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_SB_BLOCK) xfs_agblock_t xfs_sb_block(struct xfs_mount *mp); -#define XFS_SB_BLOCK(mp) xfs_sb_block(mp) +#define XFS_SB_BLOCK(mp) xfs_sb_block(mp) #else -#define XFS_SB_BLOCK(mp) XFS_HDR_BLOCK(mp, XFS_SB_DADDR) +#define XFS_SB_BLOCK(mp) XFS_HDR_BLOCK(mp, XFS_SB_DADDR) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_HDR_BLOCK) xfs_agblock_t xfs_hdr_block(struct xfs_mount *mp, xfs_daddr_t d); -#define XFS_HDR_BLOCK(mp,d) xfs_hdr_block(mp,d) +#define XFS_HDR_BLOCK(mp,d) xfs_hdr_block(mp,d) #else -#define XFS_HDR_BLOCK(mp,d) ((xfs_agblock_t)(XFS_BB_TO_FSBT(mp,d))) +#define XFS_HDR_BLOCK(mp,d) ((xfs_agblock_t)(XFS_BB_TO_FSBT(mp,d))) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DADDR_TO_FSB) xfs_fsblock_t xfs_daddr_to_fsb(struct xfs_mount *mp, xfs_daddr_t d); -#define XFS_DADDR_TO_FSB(mp,d) xfs_daddr_to_fsb(mp,d) +#define XFS_DADDR_TO_FSB(mp,d) xfs_daddr_to_fsb(mp,d) #else -#define XFS_DADDR_TO_FSB(mp,d) \ +#define XFS_DADDR_TO_FSB(mp,d) \ XFS_AGB_TO_FSB(mp, XFS_DADDR_TO_AGNO(mp,d), XFS_DADDR_TO_AGBNO(mp,d)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_FSB_TO_DADDR) xfs_daddr_t xfs_fsb_to_daddr(struct xfs_mount *mp, xfs_fsblock_t fsbno); -#define XFS_FSB_TO_DADDR(mp,fsbno) xfs_fsb_to_daddr(mp,fsbno) +#define XFS_FSB_TO_DADDR(mp,fsbno) xfs_fsb_to_daddr(mp,fsbno) #else -#define XFS_FSB_TO_DADDR(mp,fsbno) \ +#define XFS_FSB_TO_DADDR(mp,fsbno) \ XFS_AGB_TO_DADDR(mp, XFS_FSB_TO_AGNO(mp,fsbno), \ XFS_FSB_TO_AGBNO(mp,fsbno)) #endif @@ -511,11 +511,11 @@ xfs_sb_t *xfs_buf_to_sbp(struct xfs_buf *bp); /* * File system block to basic block conversions. */ -#define XFS_FSB_TO_BB(mp,fsbno) ((fsbno) << (mp)->m_blkbb_log) -#define XFS_BB_TO_FSB(mp,bb) \ +#define XFS_FSB_TO_BB(mp,fsbno) ((fsbno) << (mp)->m_blkbb_log) +#define XFS_BB_TO_FSB(mp,bb) \ (((bb) + (XFS_FSB_TO_BB(mp,1) - 1)) >> (mp)->m_blkbb_log) -#define XFS_BB_TO_FSBT(mp,bb) ((bb) >> (mp)->m_blkbb_log) -#define XFS_BB_FSB_OFFSET(mp,bb) ((bb) & ((mp)->m_bsize - 1)) +#define XFS_BB_TO_FSBT(mp,bb) ((bb) >> (mp)->m_blkbb_log) +#define XFS_BB_FSB_OFFSET(mp,bb) ((bb) & ((mp)->m_bsize - 1)) /* * File system block to byte conversions. diff --git a/include/xfs_trans.h b/include/xfs_trans.h index 23264a5b9..3cb2e0193 100644 --- a/include/xfs_trans.h +++ b/include/xfs_trans.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -29,8 +29,8 @@ * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ -#ifndef __XFS_TRANS_H__ -#define __XFS_TRANS_H__ +#ifndef __XFS_TRANS_H__ +#define __XFS_TRANS_H__ /* * This is the structure written in the log at the head of @@ -48,22 +48,22 @@ typedef struct xfs_trans_header { uint th_num_items; /* num items logged by trans */ } xfs_trans_header_t; -#define XFS_TRANS_HEADER_MAGIC 0x5452414e /* TRAN */ +#define XFS_TRANS_HEADER_MAGIC 0x5452414e /* TRAN */ /* * Log item types. */ -#define XFS_LI_5_3_BUF 0x1234 /* v1 bufs, 1-block inode buffers */ -#define XFS_LI_5_3_INODE 0x1235 /* 1-block inode buffers */ -#define XFS_LI_EFI 0x1236 -#define XFS_LI_EFD 0x1237 -#define XFS_LI_IUNLINK 0x1238 -#define XFS_LI_6_1_INODE 0x1239 /* 4K non-aligned inode bufs */ -#define XFS_LI_6_1_BUF 0x123a /* v1, 4K inode buffers */ -#define XFS_LI_INODE 0x123b /* aligned ino chunks, var-size ibufs */ -#define XFS_LI_BUF 0x123c /* v2 bufs, variable sized inode bufs */ -#define XFS_LI_DQUOT 0x123d -#define XFS_LI_QUOTAOFF 0x123e +#define XFS_LI_5_3_BUF 0x1234 /* v1 bufs, 1-block inode buffers */ +#define XFS_LI_5_3_INODE 0x1235 /* 1-block inode buffers */ +#define XFS_LI_EFI 0x1236 +#define XFS_LI_EFD 0x1237 +#define XFS_LI_IUNLINK 0x1238 +#define XFS_LI_6_1_INODE 0x1239 /* 4K non-aligned inode bufs */ +#define XFS_LI_6_1_BUF 0x123a /* v1, 4K inode buffers */ +#define XFS_LI_INODE 0x123b /* aligned ino chunks, var-size ibufs */ +#define XFS_LI_BUF 0x123c /* v2 bufs, variable sized inode bufs */ +#define XFS_LI_DQUOT 0x123d +#define XFS_LI_QUOTAOFF 0x123e /* * Transaction types. Used to distinguish types of buffers. @@ -84,15 +84,15 @@ typedef struct xfs_trans_header { #define XFS_TRANS_GROWFS 14 #define XFS_TRANS_STRAT_WRITE 15 #define XFS_TRANS_DIOSTRAT 16 -#define XFS_TRANS_WRITE_SYNC 17 -#define XFS_TRANS_WRITEID 18 -#define XFS_TRANS_ADDAFORK 19 -#define XFS_TRANS_ATTRINVAL 20 -#define XFS_TRANS_ATRUNCATE 21 -#define XFS_TRANS_ATTR_SET 22 -#define XFS_TRANS_ATTR_RM 23 -#define XFS_TRANS_ATTR_FLAG 24 -#define XFS_TRANS_CLEAR_AGI_BUCKET 25 +#define XFS_TRANS_WRITE_SYNC 17 +#define XFS_TRANS_WRITEID 18 +#define XFS_TRANS_ADDAFORK 19 +#define XFS_TRANS_ATTRINVAL 20 +#define XFS_TRANS_ATRUNCATE 21 +#define XFS_TRANS_ATTR_SET 22 +#define XFS_TRANS_ATTR_RM 23 +#define XFS_TRANS_ATTR_FLAG 24 +#define XFS_TRANS_CLEAR_AGI_BUCKET 25 #define XFS_TRANS_QM_SBCHANGE 26 /* * Dummy entries since we use the transaction type to index into the @@ -108,10 +108,10 @@ typedef struct xfs_trans_header { #define XFS_TRANS_QM_QUOTAOFF_END 34 #define XFS_TRANS_SB_UNIT 35 #define XFS_TRANS_FSYNC_TS 36 -#define XFS_TRANS_GROWFSRT_ALLOC 37 -#define XFS_TRANS_GROWFSRT_ZERO 38 -#define XFS_TRANS_GROWFSRT_FREE 39 -#define XFS_TRANS_SWAPEXT 40 +#define XFS_TRANS_GROWFSRT_ALLOC 37 +#define XFS_TRANS_GROWFSRT_ZERO 38 +#define XFS_TRANS_GROWFSRT_FREE 39 +#define XFS_TRANS_SWAPEXT 40 /* new transaction types need to be reflected in xfs_logprint(8) */ @@ -162,7 +162,7 @@ typedef struct xfs_log_item { struct xfs_item_ops *li_ops; /* function list */ } xfs_log_item_t; -#define XFS_LI_IN_AIL 0x1 +#define XFS_LI_IN_AIL 0x1 #define XFS_LI_ABORTED 0x2 typedef struct xfs_item_ops { @@ -196,10 +196,10 @@ typedef struct xfs_item_ops { /* * Return values for the IOP_TRYLOCK() routines. */ -#define XFS_ITEM_SUCCESS 0 -#define XFS_ITEM_PINNED 1 -#define XFS_ITEM_LOCKED 2 -#define XFS_ITEM_FLUSHING 3 +#define XFS_ITEM_SUCCESS 0 +#define XFS_ITEM_PINNED 1 +#define XFS_ITEM_LOCKED 2 +#define XFS_ITEM_FLUSHING 3 #define XFS_ITEM_PUSHBUF 4 #endif /* __KERNEL__ */ @@ -229,7 +229,7 @@ typedef struct xfs_log_item_desc { * in this chunk's array are free. The unused field is the first value * not used since this chunk was allocated. */ -#define XFS_LIC_NUM_SLOTS 15 +#define XFS_LIC_NUM_SLOTS 15 typedef struct xfs_log_item_chunk { struct xfs_log_item_chunk *lic_next; ushort lic_free; @@ -237,77 +237,77 @@ typedef struct xfs_log_item_chunk { xfs_log_item_desc_t lic_descs[XFS_LIC_NUM_SLOTS]; } xfs_log_item_chunk_t; -#define XFS_LIC_MAX_SLOT (XFS_LIC_NUM_SLOTS - 1) -#define XFS_LIC_FREEMASK ((1 << XFS_LIC_NUM_SLOTS) - 1) +#define XFS_LIC_MAX_SLOT (XFS_LIC_NUM_SLOTS - 1) +#define XFS_LIC_FREEMASK ((1 << XFS_LIC_NUM_SLOTS) - 1) /* - * Initialize the given chunk. Set the chunk's free descriptor mask + * Initialize the given chunk. Set the chunk's free descriptor mask * to indicate that all descriptors are free. The caller gets to set - * lic_unused to the right value (0 matches all free). The + * lic_unused to the right value (0 matches all free). The * lic_descs.lid_index values are set up as each desc is allocated. */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_LIC_INIT) void xfs_lic_init(xfs_log_item_chunk_t *cp); -#define XFS_LIC_INIT(cp) xfs_lic_init(cp) +#define XFS_LIC_INIT(cp) xfs_lic_init(cp) #else -#define XFS_LIC_INIT(cp) ((cp)->lic_free = XFS_LIC_FREEMASK) +#define XFS_LIC_INIT(cp) ((cp)->lic_free = XFS_LIC_FREEMASK) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_LIC_INIT_SLOT) void xfs_lic_init_slot(xfs_log_item_chunk_t *cp, int slot); -#define XFS_LIC_INIT_SLOT(cp,slot) xfs_lic_init_slot(cp, slot) +#define XFS_LIC_INIT_SLOT(cp,slot) xfs_lic_init_slot(cp, slot) #else -#define XFS_LIC_INIT_SLOT(cp,slot) \ +#define XFS_LIC_INIT_SLOT(cp,slot) \ ((cp)->lic_descs[slot].lid_index = (unsigned char)(slot)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_LIC_VACANCY) int xfs_lic_vacancy(xfs_log_item_chunk_t *cp); -#define XFS_LIC_VACANCY(cp) xfs_lic_vacancy(cp) +#define XFS_LIC_VACANCY(cp) xfs_lic_vacancy(cp) #else -#define XFS_LIC_VACANCY(cp) (((cp)->lic_free) & XFS_LIC_FREEMASK) +#define XFS_LIC_VACANCY(cp) (((cp)->lic_free) & XFS_LIC_FREEMASK) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_LIC_ALL_FREE) void xfs_lic_all_free(xfs_log_item_chunk_t *cp); -#define XFS_LIC_ALL_FREE(cp) xfs_lic_all_free(cp) +#define XFS_LIC_ALL_FREE(cp) xfs_lic_all_free(cp) #else -#define XFS_LIC_ALL_FREE(cp) ((cp)->lic_free = XFS_LIC_FREEMASK) +#define XFS_LIC_ALL_FREE(cp) ((cp)->lic_free = XFS_LIC_FREEMASK) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_LIC_ARE_ALL_FREE) int xfs_lic_are_all_free(xfs_log_item_chunk_t *cp); -#define XFS_LIC_ARE_ALL_FREE(cp) xfs_lic_are_all_free(cp) +#define XFS_LIC_ARE_ALL_FREE(cp) xfs_lic_are_all_free(cp) #else -#define XFS_LIC_ARE_ALL_FREE(cp) (((cp)->lic_free & XFS_LIC_FREEMASK) ==\ +#define XFS_LIC_ARE_ALL_FREE(cp) (((cp)->lic_free & XFS_LIC_FREEMASK) ==\ XFS_LIC_FREEMASK) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_LIC_ISFREE) int xfs_lic_isfree(xfs_log_item_chunk_t *cp, int slot); -#define XFS_LIC_ISFREE(cp,slot) xfs_lic_isfree(cp,slot) +#define XFS_LIC_ISFREE(cp,slot) xfs_lic_isfree(cp,slot) #else -#define XFS_LIC_ISFREE(cp,slot) ((cp)->lic_free & (1 << (slot))) +#define XFS_LIC_ISFREE(cp,slot) ((cp)->lic_free & (1 << (slot))) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_LIC_CLAIM) void xfs_lic_claim(xfs_log_item_chunk_t *cp, int slot); -#define XFS_LIC_CLAIM(cp,slot) xfs_lic_claim(cp,slot) +#define XFS_LIC_CLAIM(cp,slot) xfs_lic_claim(cp,slot) #else -#define XFS_LIC_CLAIM(cp,slot) ((cp)->lic_free &= ~(1 << (slot))) +#define XFS_LIC_CLAIM(cp,slot) ((cp)->lic_free &= ~(1 << (slot))) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_LIC_RELSE) void xfs_lic_relse(xfs_log_item_chunk_t *cp, int slot); -#define XFS_LIC_RELSE(cp,slot) xfs_lic_relse(cp,slot) +#define XFS_LIC_RELSE(cp,slot) xfs_lic_relse(cp,slot) #else -#define XFS_LIC_RELSE(cp,slot) ((cp)->lic_free |= 1 << (slot)) +#define XFS_LIC_RELSE(cp,slot) ((cp)->lic_free |= 1 << (slot)) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_LIC_SLOT) xfs_log_item_desc_t *xfs_lic_slot(xfs_log_item_chunk_t *cp, int slot); -#define XFS_LIC_SLOT(cp,slot) xfs_lic_slot(cp,slot) +#define XFS_LIC_SLOT(cp,slot) xfs_lic_slot(cp,slot) #else -#define XFS_LIC_SLOT(cp,slot) (&((cp)->lic_descs[slot])) +#define XFS_LIC_SLOT(cp,slot) (&((cp)->lic_descs[slot])) #endif #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_LIC_DESC_TO_SLOT) int xfs_lic_desc_to_slot(xfs_log_item_desc_t *dp); -#define XFS_LIC_DESC_TO_SLOT(dp) xfs_lic_desc_to_slot(dp) +#define XFS_LIC_DESC_TO_SLOT(dp) xfs_lic_desc_to_slot(dp) #else -#define XFS_LIC_DESC_TO_SLOT(dp) ((uint)((dp)->lid_index)) +#define XFS_LIC_DESC_TO_SLOT(dp) ((uint)((dp)->lid_index)) #endif /* * Calculate the address of a chunk given a descriptor pointer: @@ -318,9 +318,9 @@ int xfs_lic_desc_to_slot(xfs_log_item_desc_t *dp); */ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_LIC_DESC_TO_CHUNK) xfs_log_item_chunk_t *xfs_lic_desc_to_chunk(xfs_log_item_desc_t *dp); -#define XFS_LIC_DESC_TO_CHUNK(dp) xfs_lic_desc_to_chunk(dp) +#define XFS_LIC_DESC_TO_CHUNK(dp) xfs_lic_desc_to_chunk(dp) #else -#define XFS_LIC_DESC_TO_CHUNK(dp) ((xfs_log_item_chunk_t*) \ +#define XFS_LIC_DESC_TO_CHUNK(dp) ((xfs_log_item_chunk_t*) \ (((xfs_caddr_t)((dp) - (dp)->lid_index)) -\ (xfs_caddr_t)(((xfs_log_item_chunk_t*) \ 0)->lic_descs))) @@ -346,14 +346,14 @@ typedef struct xfs_log_busy_chunk { xfs_log_busy_slot_t lbc_busy[XFS_LBC_NUM_SLOTS]; } xfs_log_busy_chunk_t; -#define XFS_LBC_MAX_SLOT (XFS_LBC_NUM_SLOTS - 1) -#define XFS_LBC_FREEMASK ((1U << XFS_LBC_NUM_SLOTS) - 1) +#define XFS_LBC_MAX_SLOT (XFS_LBC_NUM_SLOTS - 1) +#define XFS_LBC_FREEMASK ((1U << XFS_LBC_NUM_SLOTS) - 1) -#define XFS_LBC_INIT(cp) ((cp)->lbc_free = XFS_LBC_FREEMASK) -#define XFS_LBC_CLAIM(cp, slot) ((cp)->lbc_free &= ~(1 << (slot))) -#define XFS_LBC_SLOT(cp, slot) (&((cp)->lbc_busy[(slot)])) -#define XFS_LBC_VACANCY(cp) (((cp)->lbc_free) & XFS_LBC_FREEMASK) -#define XFS_LBC_ISFREE(cp, slot) ((cp)->lbc_free & (1 << (slot))) +#define XFS_LBC_INIT(cp) ((cp)->lbc_free = XFS_LBC_FREEMASK) +#define XFS_LBC_CLAIM(cp, slot) ((cp)->lbc_free &= ~(1 << (slot))) +#define XFS_LBC_SLOT(cp, slot) (&((cp)->lbc_busy[(slot)])) +#define XFS_LBC_VACANCY(cp) (((cp)->lbc_free) & XFS_LBC_FREEMASK) +#define XFS_LBC_ISFREE(cp, slot) ((cp)->lbc_free & (1 << (slot))) /* * This is the type of function which can be given to xfs_trans_callback() @@ -373,21 +373,21 @@ typedef struct xfs_trans { unsigned int t_log_res; /* amt of log space resvd */ unsigned int t_log_count; /* count for perm log res */ unsigned int t_blk_res; /* # of blocks resvd */ - unsigned int t_blk_res_used; /* # of resvd blocks used */ + unsigned int t_blk_res_used; /* # of resvd blocks used */ unsigned int t_rtx_res; /* # of rt extents resvd */ - unsigned int t_rtx_res_used; /* # of resvd rt extents used */ + unsigned int t_rtx_res_used; /* # of resvd rt extents used */ xfs_log_ticket_t t_ticket; /* log mgr ticket */ sema_t t_sema; /* sema for commit completion */ xfs_lsn_t t_lsn; /* log seq num of start of * transaction. */ - xfs_lsn_t t_commit_lsn; /* log seq num of end of + xfs_lsn_t t_commit_lsn; /* log seq num of end of * transaction. */ struct xfs_mount *t_mountp; /* ptr to fs mount struct */ - struct xfs_dquot_acct *t_dqinfo; /* accting info for dquots */ + struct xfs_dquot_acct *t_dqinfo; /* accting info for dquots */ xfs_trans_callback_t t_callback; /* transaction callback */ void *t_callarg; /* callback arg */ unsigned int t_flags; /* misc flags */ - long t_icount_delta; /* superblock icount change */ + long t_icount_delta; /* superblock icount change */ long t_ifree_delta; /* superblock ifree change */ long t_fdblocks_delta; /* superblock fdblocks chg */ long t_res_fdblocks_delta; /* on-disk only chg */ @@ -414,42 +414,42 @@ typedef struct xfs_trans { #endif /* __KERNEL__ */ -#define XFS_TRANS_MAGIC 0x5452414E /* 'TRAN' */ +#define XFS_TRANS_MAGIC 0x5452414E /* 'TRAN' */ /* * Values for t_flags. */ -#define XFS_TRANS_DIRTY 0x01 /* something needs to be logged */ -#define XFS_TRANS_SB_DIRTY 0x02 /* superblock is modified */ -#define XFS_TRANS_PERM_LOG_RES 0x04 /* xact took a permanent log res */ -#define XFS_TRANS_SYNC 0x08 /* make commit synchronous */ +#define XFS_TRANS_DIRTY 0x01 /* something needs to be logged */ +#define XFS_TRANS_SB_DIRTY 0x02 /* superblock is modified */ +#define XFS_TRANS_PERM_LOG_RES 0x04 /* xact took a permanent log res */ +#define XFS_TRANS_SYNC 0x08 /* make commit synchronous */ #define XFS_TRANS_DQ_DIRTY 0x10 /* at least one dquot in trx dirty */ -#define XFS_TRANS_RESERVE 0x20 /* OK to use reserved data blocks */ +#define XFS_TRANS_RESERVE 0x20 /* OK to use reserved data blocks */ /* * Values for call flags parameter. */ -#define XFS_TRANS_NOSLEEP 0x1 -#define XFS_TRANS_WAIT 0x2 -#define XFS_TRANS_RELEASE_LOG_RES 0x4 -#define XFS_TRANS_ABORT 0x8 +#define XFS_TRANS_NOSLEEP 0x1 +#define XFS_TRANS_WAIT 0x2 +#define XFS_TRANS_RELEASE_LOG_RES 0x4 +#define XFS_TRANS_ABORT 0x8 /* * Field values for xfs_trans_mod_sb. */ -#define XFS_TRANS_SB_ICOUNT 0x00000001 -#define XFS_TRANS_SB_IFREE 0x00000002 -#define XFS_TRANS_SB_FDBLOCKS 0x00000004 -#define XFS_TRANS_SB_RES_FDBLOCKS 0x00000008 -#define XFS_TRANS_SB_FREXTENTS 0x00000010 -#define XFS_TRANS_SB_RES_FREXTENTS 0x00000020 -#define XFS_TRANS_SB_DBLOCKS 0x00000040 -#define XFS_TRANS_SB_AGCOUNT 0x00000080 -#define XFS_TRANS_SB_IMAXPCT 0x00000100 -#define XFS_TRANS_SB_REXTSIZE 0x00000200 -#define XFS_TRANS_SB_RBMBLOCKS 0x00000400 -#define XFS_TRANS_SB_RBLOCKS 0x00000800 -#define XFS_TRANS_SB_REXTENTS 0x00001000 -#define XFS_TRANS_SB_REXTSLOG 0x00002000 +#define XFS_TRANS_SB_ICOUNT 0x00000001 +#define XFS_TRANS_SB_IFREE 0x00000002 +#define XFS_TRANS_SB_FDBLOCKS 0x00000004 +#define XFS_TRANS_SB_RES_FDBLOCKS 0x00000008 +#define XFS_TRANS_SB_FREXTENTS 0x00000010 +#define XFS_TRANS_SB_RES_FREXTENTS 0x00000020 +#define XFS_TRANS_SB_DBLOCKS 0x00000040 +#define XFS_TRANS_SB_AGCOUNT 0x00000080 +#define XFS_TRANS_SB_IMAXPCT 0x00000100 +#define XFS_TRANS_SB_REXTSIZE 0x00000200 +#define XFS_TRANS_SB_RBMBLOCKS 0x00000400 +#define XFS_TRANS_SB_RBLOCKS 0x00000800 +#define XFS_TRANS_SB_REXTENTS 0x00001000 +#define XFS_TRANS_SB_REXTSLOG 0x00002000 /* @@ -475,9 +475,9 @@ typedef struct xfs_trans { * involved in freeing or allocating an extent. * 2 trees * (2 blocks/level * max depth - 1) * block size */ -#define XFS_ALLOCFREE_LOG_RES(mp,nx) \ +#define XFS_ALLOCFREE_LOG_RES(mp,nx) \ ((nx) * (2 * XFS_FSB_TO_B((mp), 2 * XFS_AG_MAXLEVELS(mp) - 1))) -#define XFS_ALLOCFREE_LOG_COUNT(mp,nx) \ +#define XFS_ALLOCFREE_LOG_COUNT(mp,nx) \ ((nx) * (2 * (2 * XFS_AG_MAXLEVELS(mp) - 1))) /* @@ -487,10 +487,10 @@ typedef struct xfs_trans { * v2 directory blocks can be fragmented below the dirblksize down to the fsb * size, so account for that in the DAENTER macros. */ -#define XFS_DIROP_LOG_RES(mp) \ +#define XFS_DIROP_LOG_RES(mp) \ (XFS_FSB_TO_B(mp, XFS_DAENTER_BLOCKS(mp, XFS_DATA_FORK)) + \ (XFS_FSB_TO_B(mp, XFS_DAENTER_BMAPS(mp, XFS_DATA_FORK) + 1))) -#define XFS_DIROP_LOG_COUNT(mp) \ +#define XFS_DIROP_LOG_COUNT(mp) \ (XFS_DAENTER_BLOCKS(mp, XFS_DATA_FORK) + \ XFS_DAENTER_BMAPS(mp, XFS_DATA_FORK) + 1) @@ -522,7 +522,7 @@ typedef struct xfs_trans { XFS_ALLOCFREE_LOG_RES(mp, 2) + \ (128 * (5 + XFS_ALLOCFREE_LOG_COUNT(mp, 2)))))) -#define XFS_WRITE_LOG_RES(mp) ((mp)->m_reservations.tr_write) +#define XFS_WRITE_LOG_RES(mp) ((mp)->m_reservations.tr_write) /* * In truncating a file we free up to two extents at once. We can modify: @@ -535,7 +535,7 @@ typedef struct xfs_trans { * worst case split in allocation btrees per extent assuming 4 extents: * 4 exts * 2 trees * (2 * max depth - 1) * block size */ -#define XFS_CALC_ITRUNCATE_LOG_RES(mp) \ +#define XFS_CALC_ITRUNCATE_LOG_RES(mp) \ (MAX( \ ((mp)->m_sb.sb_inodesize + \ XFS_FSB_TO_B((mp), XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK) + 1) + \ @@ -546,7 +546,7 @@ typedef struct xfs_trans { XFS_ALLOCFREE_LOG_RES(mp, 4) + \ (128 * (9 + XFS_ALLOCFREE_LOG_COUNT(mp, 4)))))) -#define XFS_ITRUNCATE_LOG_RES(mp) ((mp)->m_reservations.tr_itruncate) +#define XFS_ITRUNCATE_LOG_RES(mp) ((mp)->m_reservations.tr_itruncate) /* * In renaming a files we can modify: @@ -560,7 +560,7 @@ typedef struct xfs_trans { * the superblock for the free block count: sector size * the allocation btrees: 3 exts * 2 trees * (2 * max depth - 1) * block size */ -#define XFS_CALC_RENAME_LOG_RES(mp) \ +#define XFS_CALC_RENAME_LOG_RES(mp) \ (MAX( \ ((4 * (mp)->m_sb.sb_inodesize) + \ (2 * XFS_DIROP_LOG_RES(mp)) + \ @@ -571,7 +571,7 @@ typedef struct xfs_trans { XFS_ALLOCFREE_LOG_RES(mp, 3) + \ (128 * (7 + XFS_ALLOCFREE_LOG_COUNT(mp, 3)))))) -#define XFS_RENAME_LOG_RES(mp) ((mp)->m_reservations.tr_rename) +#define XFS_RENAME_LOG_RES(mp) ((mp)->m_reservations.tr_rename) /* * For creating a link to an inode: @@ -585,7 +585,7 @@ typedef struct xfs_trans { * the superblock for the free block count: sector size * the allocation btrees: 2 trees * (2 * max depth - 1) * block size */ -#define XFS_CALC_LINK_LOG_RES(mp) \ +#define XFS_CALC_LINK_LOG_RES(mp) \ (MAX( \ ((mp)->m_sb.sb_inodesize + \ (mp)->m_sb.sb_inodesize + \ @@ -597,7 +597,7 @@ typedef struct xfs_trans { XFS_ALLOCFREE_LOG_RES(mp, 1) + \ (128 * (3 + XFS_ALLOCFREE_LOG_COUNT(mp, 1)))))) -#define XFS_LINK_LOG_RES(mp) ((mp)->m_reservations.tr_link) +#define XFS_LINK_LOG_RES(mp) ((mp)->m_reservations.tr_link) /* * For removing a directory entry we can modify: @@ -611,7 +611,7 @@ typedef struct xfs_trans { * the superblock for the free block count: sector size * the allocation btrees: 2 exts * 2 trees * (2 * max depth - 1) * block size */ -#define XFS_CALC_REMOVE_LOG_RES(mp) \ +#define XFS_CALC_REMOVE_LOG_RES(mp) \ (MAX( \ ((mp)->m_sb.sb_inodesize + \ (mp)->m_sb.sb_inodesize + \ @@ -623,7 +623,7 @@ typedef struct xfs_trans { XFS_ALLOCFREE_LOG_RES(mp, 2) + \ (128 * (5 + XFS_ALLOCFREE_LOG_COUNT(mp, 2)))))) -#define XFS_REMOVE_LOG_RES(mp) ((mp)->m_reservations.tr_remove) +#define XFS_REMOVE_LOG_RES(mp) ((mp)->m_reservations.tr_remove) /* * For symlink we can modify: @@ -639,7 +639,7 @@ typedef struct xfs_trans { * the inode btree: max depth * blocksize * the allocation btrees: 2 trees * (2 * max depth - 1) * block size */ -#define XFS_CALC_SYMLINK_LOG_RES(mp) \ +#define XFS_CALC_SYMLINK_LOG_RES(mp) \ (MAX( \ ((mp)->m_sb.sb_inodesize + \ (mp)->m_sb.sb_inodesize + \ @@ -654,7 +654,7 @@ typedef struct xfs_trans { (128 * (2 + XFS_IALLOC_BLOCKS(mp) + XFS_IN_MAXLEVELS(mp) + \ XFS_ALLOCFREE_LOG_COUNT(mp, 1)))))) -#define XFS_SYMLINK_LOG_RES(mp) ((mp)->m_reservations.tr_symlink) +#define XFS_SYMLINK_LOG_RES(mp) ((mp)->m_reservations.tr_symlink) /* * For create we can modify: @@ -671,7 +671,7 @@ typedef struct xfs_trans { * the inode btree: max depth * blocksize * the allocation btrees: 2 trees * (max depth - 1) * block size */ -#define XFS_CALC_CREATE_LOG_RES(mp) \ +#define XFS_CALC_CREATE_LOG_RES(mp) \ (MAX( \ ((mp)->m_sb.sb_inodesize + \ (mp)->m_sb.sb_inodesize + \ @@ -686,14 +686,14 @@ typedef struct xfs_trans { (128 * (2 + XFS_IALLOC_BLOCKS(mp) + XFS_IN_MAXLEVELS(mp) + \ XFS_ALLOCFREE_LOG_COUNT(mp, 1)))))) -#define XFS_CREATE_LOG_RES(mp) ((mp)->m_reservations.tr_create) +#define XFS_CREATE_LOG_RES(mp) ((mp)->m_reservations.tr_create) /* * Making a new directory is the same as creating a new file. */ -#define XFS_CALC_MKDIR_LOG_RES(mp) XFS_CALC_CREATE_LOG_RES(mp) +#define XFS_CALC_MKDIR_LOG_RES(mp) XFS_CALC_CREATE_LOG_RES(mp) -#define XFS_MKDIR_LOG_RES(mp) ((mp)->m_reservations.tr_mkdir) +#define XFS_MKDIR_LOG_RES(mp) ((mp)->m_reservations.tr_mkdir) /* * In freeing an inode we can modify: @@ -703,7 +703,7 @@ typedef struct xfs_trans { * the inode btree entry: block size * the on disk inode before ours in the agi hash list: inode cluster size */ -#define XFS_CALC_IFREE_LOG_RES(mp) \ +#define XFS_CALC_IFREE_LOG_RES(mp) \ ((mp)->m_sb.sb_inodesize + \ (mp)->m_sb.sb_sectsize + \ (mp)->m_sb.sb_sectsize + \ @@ -711,16 +711,16 @@ typedef struct xfs_trans { MAX((__uint16_t)XFS_FSB_TO_B((mp), 1), XFS_INODE_CLUSTER_SIZE(mp)) + \ (128 * 5)) -#define XFS_IFREE_LOG_RES(mp) ((mp)->m_reservations.tr_ifree) +#define XFS_IFREE_LOG_RES(mp) ((mp)->m_reservations.tr_ifree) /* * When only changing the inode we log the inode and possibly the superblock * We also add a bit of slop for the transaction stuff. */ -#define XFS_CALC_ICHANGE_LOG_RES(mp) ((mp)->m_sb.sb_inodesize + \ +#define XFS_CALC_ICHANGE_LOG_RES(mp) ((mp)->m_sb.sb_inodesize + \ (mp)->m_sb.sb_sectsize + 512) -#define XFS_ICHANGE_LOG_RES(mp) ((mp)->m_reservations.tr_ichange) +#define XFS_ICHANGE_LOG_RES(mp) ((mp)->m_reservations.tr_ichange) /* * Growing the data section of the filesystem. @@ -728,12 +728,12 @@ typedef struct xfs_trans { * agi and agf * allocation btrees */ -#define XFS_CALC_GROWDATA_LOG_RES(mp) \ +#define XFS_CALC_GROWDATA_LOG_RES(mp) \ ((mp)->m_sb.sb_sectsize * 3 + \ XFS_ALLOCFREE_LOG_RES(mp, 1) + \ (128 * (3 + XFS_ALLOCFREE_LOG_COUNT(mp, 1)))) -#define XFS_GROWDATA_LOG_RES(mp) ((mp)->m_reservations.tr_growdata) +#define XFS_GROWDATA_LOG_RES(mp) ((mp)->m_reservations.tr_growdata) /* * Growing the rt section of the filesystem. @@ -745,7 +745,7 @@ typedef struct xfs_trans { * bitmap/summary inode: inode size * allocation btrees for 1 block alloc: 2 * (2 * maxdepth - 1) * blocksize */ -#define XFS_CALC_GROWRTALLOC_LOG_RES(mp) \ +#define XFS_CALC_GROWRTALLOC_LOG_RES(mp) \ (2 * (mp)->m_sb.sb_sectsize + \ XFS_FSB_TO_B((mp), XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK)) + \ (mp)->m_sb.sb_inodesize + \ @@ -754,17 +754,17 @@ typedef struct xfs_trans { (3 + XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK) + \ XFS_ALLOCFREE_LOG_COUNT(mp, 1)))) -#define XFS_GROWRTALLOC_LOG_RES(mp) ((mp)->m_reservations.tr_growrtalloc) +#define XFS_GROWRTALLOC_LOG_RES(mp) ((mp)->m_reservations.tr_growrtalloc) /* * Growing the rt section of the filesystem. * In the second set of transactions (ZERO) we zero the new metadata blocks. * one bitmap/summary block: blocksize */ -#define XFS_CALC_GROWRTZERO_LOG_RES(mp) \ +#define XFS_CALC_GROWRTZERO_LOG_RES(mp) \ ((mp)->m_sb.sb_blocksize + 128) -#define XFS_GROWRTZERO_LOG_RES(mp) ((mp)->m_reservations.tr_growrtzero) +#define XFS_GROWRTZERO_LOG_RES(mp) ((mp)->m_reservations.tr_growrtzero) /* * Growing the rt section of the filesystem. @@ -776,38 +776,38 @@ typedef struct xfs_trans { * one bitmap block: blocksize * summary blocks: new summary size */ -#define XFS_CALC_GROWRTFREE_LOG_RES(mp) \ +#define XFS_CALC_GROWRTFREE_LOG_RES(mp) \ ((mp)->m_sb.sb_sectsize + \ 2 * (mp)->m_sb.sb_inodesize + \ (mp)->m_sb.sb_blocksize + \ (mp)->m_rsumsize + \ (128 * 5)) -#define XFS_GROWRTFREE_LOG_RES(mp) ((mp)->m_reservations.tr_growrtfree) +#define XFS_GROWRTFREE_LOG_RES(mp) ((mp)->m_reservations.tr_growrtfree) /* * Logging the inode modification timestamp on a synchronous write. * inode */ -#define XFS_CALC_SWRITE_LOG_RES(mp) \ +#define XFS_CALC_SWRITE_LOG_RES(mp) \ ((mp)->m_sb.sb_inodesize + 128) -#define XFS_SWRITE_LOG_RES(mp) ((mp)->m_reservations.tr_swrite) +#define XFS_SWRITE_LOG_RES(mp) ((mp)->m_reservations.tr_swrite) /* * Logging the inode timestamps on an fsync -- same as SWRITE * as long as SWRITE logs the entire inode core */ -#define XFS_FSYNC_TS_LOG_RES(mp) ((mp)->m_reservations.tr_swrite) +#define XFS_FSYNC_TS_LOG_RES(mp) ((mp)->m_reservations.tr_swrite) /* * Logging the inode mode bits when writing a setuid/setgid file * inode */ -#define XFS_CALC_WRITEID_LOG_RES(mp) \ +#define XFS_CALC_WRITEID_LOG_RES(mp) \ ((mp)->m_sb.sb_inodesize + 128) -#define XFS_WRITEID_LOG_RES(mp) ((mp)->m_reservations.tr_swrite) +#define XFS_WRITEID_LOG_RES(mp) ((mp)->m_reservations.tr_swrite) /* * Converting the inode from non-attributed to attributed. @@ -817,7 +817,7 @@ typedef struct xfs_trans { * bmap blocks for the new directory block * allocation btrees */ -#define XFS_CALC_ADDAFORK_LOG_RES(mp) \ +#define XFS_CALC_ADDAFORK_LOG_RES(mp) \ ((mp)->m_sb.sb_inodesize + \ (mp)->m_sb.sb_sectsize * 2 + \ (mp)->m_dirblksize + \ @@ -829,7 +829,7 @@ typedef struct xfs_trans { XFS_DAENTER_BMAP1B(mp, XFS_DATA_FORK) + 1) + \ XFS_ALLOCFREE_LOG_COUNT(mp, 1)))) -#define XFS_ADDAFORK_LOG_RES(mp) ((mp)->m_reservations.tr_addafork) +#define XFS_ADDAFORK_LOG_RES(mp) ((mp)->m_reservations.tr_addafork) /* * Removing the attribute fork of a file @@ -842,7 +842,7 @@ typedef struct xfs_trans { * worst case split in allocation btrees per extent assuming 4 extents: * 4 exts * 2 trees * (2 * max depth - 1) * block size */ -#define XFS_CALC_ATTRINVAL_LOG_RES(mp) \ +#define XFS_CALC_ATTRINVAL_LOG_RES(mp) \ (MAX( \ ((mp)->m_sb.sb_inodesize + \ XFS_FSB_TO_B((mp), XFS_BM_MAXLEVELS(mp, XFS_ATTR_FORK)) + \ @@ -853,7 +853,7 @@ typedef struct xfs_trans { XFS_ALLOCFREE_LOG_RES(mp, 4) + \ (128 * (9 + XFS_ALLOCFREE_LOG_COUNT(mp, 4)))))) -#define XFS_ATTRINVAL_LOG_RES(mp) ((mp)->m_reservations.tr_attrinval) +#define XFS_ATTRINVAL_LOG_RES(mp) ((mp)->m_reservations.tr_attrinval) /* * Setting an attribute. @@ -865,13 +865,13 @@ typedef struct xfs_trans { * Since attribute transaction space is dependent on the size of the attribute, * the calculation is done partially at mount time and partially at runtime. */ -#define XFS_CALC_ATTRSET_LOG_RES(mp) \ +#define XFS_CALC_ATTRSET_LOG_RES(mp) \ ((mp)->m_sb.sb_inodesize + \ (mp)->m_sb.sb_sectsize + \ XFS_FSB_TO_B((mp), XFS_DA_NODE_MAXDEPTH) + \ (128 * (2 + XFS_DA_NODE_MAXDEPTH))) -#define XFS_ATTRSET_LOG_RES(mp, ext) \ +#define XFS_ATTRSET_LOG_RES(mp, ext) \ ((mp)->m_reservations.tr_attrset + \ (ext * (mp)->m_sb.sb_sectsize) + \ (ext * XFS_FSB_TO_B((mp), XFS_BM_MAXLEVELS(mp, XFS_ATTR_FORK))) + \ @@ -888,7 +888,7 @@ typedef struct xfs_trans { * the superblock for the free block count: sector size * the allocation btrees: 2 exts * 2 trees * (2 * max depth - 1) * block size */ -#define XFS_CALC_ATTRRM_LOG_RES(mp) \ +#define XFS_CALC_ATTRRM_LOG_RES(mp) \ (MAX( \ ((mp)->m_sb.sb_inodesize + \ XFS_FSB_TO_B((mp), XFS_DA_NODE_MAXDEPTH) + \ @@ -900,69 +900,69 @@ typedef struct xfs_trans { XFS_ALLOCFREE_LOG_RES(mp, 2) + \ (128 * (5 + XFS_ALLOCFREE_LOG_COUNT(mp, 2)))))) -#define XFS_ATTRRM_LOG_RES(mp) ((mp)->m_reservations.tr_attrrm) +#define XFS_ATTRRM_LOG_RES(mp) ((mp)->m_reservations.tr_attrrm) /* * Clearing a bad agino number in an agi hash bucket. */ -#define XFS_CALC_CLEAR_AGI_BUCKET_LOG_RES(mp) \ +#define XFS_CALC_CLEAR_AGI_BUCKET_LOG_RES(mp) \ ((mp)->m_sb.sb_sectsize + 128) -#define XFS_CLEAR_AGI_BUCKET_LOG_RES(mp) ((mp)->m_reservations.tr_clearagi) +#define XFS_CLEAR_AGI_BUCKET_LOG_RES(mp) ((mp)->m_reservations.tr_clearagi) /* * Various log count values. */ -#define XFS_DEFAULT_LOG_COUNT 1 -#define XFS_DEFAULT_PERM_LOG_COUNT 2 -#define XFS_ITRUNCATE_LOG_COUNT 2 -#define XFS_CREATE_LOG_COUNT 2 -#define XFS_MKDIR_LOG_COUNT 3 -#define XFS_SYMLINK_LOG_COUNT 3 -#define XFS_REMOVE_LOG_COUNT 2 -#define XFS_LINK_LOG_COUNT 2 -#define XFS_RENAME_LOG_COUNT 2 -#define XFS_WRITE_LOG_COUNT 2 -#define XFS_ADDAFORK_LOG_COUNT 2 -#define XFS_ATTRINVAL_LOG_COUNT 1 -#define XFS_ATTRSET_LOG_COUNT 3 -#define XFS_ATTRRM_LOG_COUNT 3 +#define XFS_DEFAULT_LOG_COUNT 1 +#define XFS_DEFAULT_PERM_LOG_COUNT 2 +#define XFS_ITRUNCATE_LOG_COUNT 2 +#define XFS_CREATE_LOG_COUNT 2 +#define XFS_MKDIR_LOG_COUNT 3 +#define XFS_SYMLINK_LOG_COUNT 3 +#define XFS_REMOVE_LOG_COUNT 2 +#define XFS_LINK_LOG_COUNT 2 +#define XFS_RENAME_LOG_COUNT 2 +#define XFS_WRITE_LOG_COUNT 2 +#define XFS_ADDAFORK_LOG_COUNT 2 +#define XFS_ATTRINVAL_LOG_COUNT 1 +#define XFS_ATTRSET_LOG_COUNT 3 +#define XFS_ATTRRM_LOG_COUNT 3 /* * Here we centralize the specification of XFS meta-data buffer * reference count values. This determine how hard the buffer * cache tries to hold onto the buffer. */ -#define XFS_AGF_REF 4 -#define XFS_AGI_REF 4 -#define XFS_AGFL_REF 3 -#define XFS_INO_BTREE_REF 3 -#define XFS_ALLOC_BTREE_REF 2 -#define XFS_BMAP_BTREE_REF 2 -#define XFS_DIR_BTREE_REF 2 -#define XFS_ATTR_BTREE_REF 1 -#define XFS_INO_REF 1 -#define XFS_DQUOT_REF 1 +#define XFS_AGF_REF 4 +#define XFS_AGI_REF 4 +#define XFS_AGFL_REF 3 +#define XFS_INO_BTREE_REF 3 +#define XFS_ALLOC_BTREE_REF 2 +#define XFS_BMAP_BTREE_REF 2 +#define XFS_DIR_BTREE_REF 2 +#define XFS_ATTR_BTREE_REF 1 +#define XFS_INO_REF 1 +#define XFS_DQUOT_REF 1 #ifdef __KERNEL__ /* * XFS transaction mechanism exported interfaces that are * actually macros. */ -#define xfs_trans_get_log_res(tp) ((tp)->t_log_res) -#define xfs_trans_get_log_count(tp) ((tp)->t_log_count) -#define xfs_trans_get_block_res(tp) ((tp)->t_blk_res) -#define xfs_trans_set_sync(tp) ((tp)->t_flags |= XFS_TRANS_SYNC) +#define xfs_trans_get_log_res(tp) ((tp)->t_log_res) +#define xfs_trans_get_log_count(tp) ((tp)->t_log_count) +#define xfs_trans_get_block_res(tp) ((tp)->t_blk_res) +#define xfs_trans_set_sync(tp) ((tp)->t_flags |= XFS_TRANS_SYNC) #ifdef DEBUG -#define xfs_trans_agblocks_delta(tp, d) ((tp)->t_ag_freeblks_delta += (long)d) -#define xfs_trans_agflist_delta(tp, d) ((tp)->t_ag_flist_delta += (long)d) -#define xfs_trans_agbtree_delta(tp, d) ((tp)->t_ag_btree_delta += (long)d) +#define xfs_trans_agblocks_delta(tp, d) ((tp)->t_ag_freeblks_delta += (long)d) +#define xfs_trans_agflist_delta(tp, d) ((tp)->t_ag_flist_delta += (long)d) +#define xfs_trans_agbtree_delta(tp, d) ((tp)->t_ag_btree_delta += (long)d) #else -#define xfs_trans_agblocks_delta(tp, d) -#define xfs_trans_agflist_delta(tp, d) -#define xfs_trans_agbtree_delta(tp, d) +#define xfs_trans_agblocks_delta(tp, d) +#define xfs_trans_agflist_delta(tp, d) +#define xfs_trans_agbtree_delta(tp, d) #endif /* @@ -1000,13 +1000,13 @@ void xfs_trans_ihold(xfs_trans_t *, struct xfs_inode *); void xfs_trans_ihold_release(xfs_trans_t *, struct xfs_inode *); void xfs_trans_log_buf(xfs_trans_t *, struct xfs_buf *, uint, uint); void xfs_trans_log_inode(xfs_trans_t *, struct xfs_inode *, uint); -struct xfs_efi_log_item *xfs_trans_get_efi(xfs_trans_t *, uint); +struct xfs_efi_log_item *xfs_trans_get_efi(xfs_trans_t *, uint); void xfs_efi_release(struct xfs_efi_log_item *, uint); void xfs_trans_log_efi_extent(xfs_trans_t *, struct xfs_efi_log_item *, xfs_fsblock_t, xfs_extlen_t); -struct xfs_efd_log_item *xfs_trans_get_efd(xfs_trans_t *, +struct xfs_efd_log_item *xfs_trans_get_efd(xfs_trans_t *, struct xfs_efi_log_item *, uint); void xfs_trans_log_efd_extent(xfs_trans_t *, diff --git a/include/xfs_trans_space.h b/include/xfs_trans_space.h index 1dec9dc10..e91d173f4 100644 --- a/include/xfs_trans_space.h +++ b/include/xfs_trans_space.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -35,71 +35,71 @@ /* * Components of space reservations. */ -#define XFS_MAX_CONTIG_EXTENTS_PER_BLOCK(mp) \ +#define XFS_MAX_CONTIG_EXTENTS_PER_BLOCK(mp) \ (((mp)->m_alloc_mxr[0]) - ((mp)->m_alloc_mnr[0])) -#define XFS_EXTENTADD_SPACE_RES(mp,w) (XFS_BM_MAXLEVELS(mp,w) - 1) +#define XFS_EXTENTADD_SPACE_RES(mp,w) (XFS_BM_MAXLEVELS(mp,w) - 1) #define XFS_NEXTENTADD_SPACE_RES(mp,b,w)\ (((b + XFS_MAX_CONTIG_EXTENTS_PER_BLOCK(mp) - 1) / \ XFS_MAX_CONTIG_EXTENTS_PER_BLOCK(mp)) * \ XFS_EXTENTADD_SPACE_RES(mp,w)) -#define XFS_DAENTER_1B(mp,w) ((w) == XFS_DATA_FORK ? (mp)->m_dirblkfsbs : 1) -#define XFS_DAENTER_DBS(mp,w) \ +#define XFS_DAENTER_1B(mp,w) ((w) == XFS_DATA_FORK ? (mp)->m_dirblkfsbs : 1) +#define XFS_DAENTER_DBS(mp,w) \ (XFS_DA_NODE_MAXDEPTH + \ ((XFS_DIR_IS_V2(mp) && (w) == XFS_DATA_FORK) ? 2 : 0)) -#define XFS_DAENTER_BLOCKS(mp,w) \ +#define XFS_DAENTER_BLOCKS(mp,w) \ (XFS_DAENTER_1B(mp,w) * XFS_DAENTER_DBS(mp,w)) -#define XFS_DAENTER_BMAP1B(mp,w) \ +#define XFS_DAENTER_BMAP1B(mp,w) \ XFS_NEXTENTADD_SPACE_RES(mp, XFS_DAENTER_1B(mp, w), w) -#define XFS_DAENTER_BMAPS(mp,w) \ +#define XFS_DAENTER_BMAPS(mp,w) \ (XFS_DAENTER_DBS(mp,w) * XFS_DAENTER_BMAP1B(mp,w)) -#define XFS_DAENTER_SPACE_RES(mp,w) \ +#define XFS_DAENTER_SPACE_RES(mp,w) \ (XFS_DAENTER_BLOCKS(mp,w) + XFS_DAENTER_BMAPS(mp,w)) -#define XFS_DAREMOVE_SPACE_RES(mp,w) XFS_DAENTER_BMAPS(mp,w) -#define XFS_DIRENTER_MAX_SPLIT(mp,nl) \ +#define XFS_DAREMOVE_SPACE_RES(mp,w) XFS_DAENTER_BMAPS(mp,w) +#define XFS_DIRENTER_MAX_SPLIT(mp,nl) \ (((mp)->m_sb.sb_blocksize == 512 && \ XFS_DIR_IS_V1(mp) && \ (nl) >= XFS_DIR_LEAF_CAN_DOUBLE_SPLIT_LEN) ? 2 : 1) -#define XFS_DIRENTER_SPACE_RES(mp,nl) \ +#define XFS_DIRENTER_SPACE_RES(mp,nl) \ (XFS_DAENTER_SPACE_RES(mp, XFS_DATA_FORK) * \ XFS_DIRENTER_MAX_SPLIT(mp,nl)) -#define XFS_DIRREMOVE_SPACE_RES(mp) \ +#define XFS_DIRREMOVE_SPACE_RES(mp) \ XFS_DAREMOVE_SPACE_RES(mp, XFS_DATA_FORK) -#define XFS_IALLOC_SPACE_RES(mp) \ +#define XFS_IALLOC_SPACE_RES(mp) \ (XFS_IALLOC_BLOCKS(mp) + XFS_IN_MAXLEVELS(mp)-1) /* * Space reservation values for various transactions. */ -#define XFS_ADDAFORK_SPACE_RES(mp) \ +#define XFS_ADDAFORK_SPACE_RES(mp) \ ((mp)->m_dirblkfsbs + \ (XFS_DIR_IS_V1(mp) ? 0 : XFS_DAENTER_BMAP1B(mp, XFS_DATA_FORK))) -#define XFS_ATTRRM_SPACE_RES(mp) \ +#define XFS_ATTRRM_SPACE_RES(mp) \ XFS_DAREMOVE_SPACE_RES(mp, XFS_ATTR_FORK) /* This macro is not used - see inline code in xfs_attr_set */ -#define XFS_ATTRSET_SPACE_RES(mp, v) \ +#define XFS_ATTRSET_SPACE_RES(mp, v) \ (XFS_DAENTER_SPACE_RES(mp, XFS_ATTR_FORK) + XFS_B_TO_FSB(mp, v)) -#define XFS_CREATE_SPACE_RES(mp,nl) \ +#define XFS_CREATE_SPACE_RES(mp,nl) \ (XFS_IALLOC_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl)) -#define XFS_DIOSTRAT_SPACE_RES(mp, v) \ +#define XFS_DIOSTRAT_SPACE_RES(mp, v) \ (XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK) + (v)) -#define XFS_GROWFS_SPACE_RES(mp) \ +#define XFS_GROWFS_SPACE_RES(mp) \ (2 * XFS_AG_MAXLEVELS(mp)) -#define XFS_GROWFSRT_SPACE_RES(mp,b) \ +#define XFS_GROWFSRT_SPACE_RES(mp,b) \ ((b) + XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK)) -#define XFS_LINK_SPACE_RES(mp,nl) \ +#define XFS_LINK_SPACE_RES(mp,nl) \ XFS_DIRENTER_SPACE_RES(mp,nl) -#define XFS_MKDIR_SPACE_RES(mp,nl) \ +#define XFS_MKDIR_SPACE_RES(mp,nl) \ (XFS_IALLOC_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl)) -#define XFS_QM_DQALLOC_SPACE_RES(mp) \ +#define XFS_QM_DQALLOC_SPACE_RES(mp) \ (XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK) + \ XFS_DQUOT_CLUSTER_SIZE_FSB) -#define XFS_QM_QINOCREATE_SPACE_RES(mp) \ +#define XFS_QM_QINOCREATE_SPACE_RES(mp) \ XFS_IALLOC_SPACE_RES(mp) -#define XFS_REMOVE_SPACE_RES(mp) \ +#define XFS_REMOVE_SPACE_RES(mp) \ XFS_DIRREMOVE_SPACE_RES(mp) -#define XFS_RENAME_SPACE_RES(mp,nl) \ +#define XFS_RENAME_SPACE_RES(mp,nl) \ (XFS_DIRREMOVE_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl)) -#define XFS_SYMLINK_SPACE_RES(mp,nl,b) \ +#define XFS_SYMLINK_SPACE_RES(mp,nl,b) \ (XFS_IALLOC_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl) + (b)) #endif /* __XFS_TRANS_SPACE_H__ */ diff --git a/include/xfs_types.h b/include/xfs_types.h index 6e9b5d88d..38c28e921 100644 --- a/include/xfs_types.h +++ b/include/xfs_types.h @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -30,7 +30,7 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef __XFS_TYPES_H__ -#define __XFS_TYPES_H__ +#define __XFS_TYPES_H__ #ifdef __KERNEL__ @@ -101,21 +101,21 @@ typedef __uint64_t __psunsigned_t; #endif typedef __uint32_t xfs_agblock_t; /* blockno in alloc. group */ -typedef __uint32_t xfs_extlen_t; /* extent length in blocks */ -typedef __uint32_t xfs_agnumber_t; /* allocation group number */ +typedef __uint32_t xfs_extlen_t; /* extent length in blocks */ +typedef __uint32_t xfs_agnumber_t; /* allocation group number */ typedef __int32_t xfs_extnum_t; /* # of extents in a file */ typedef __int16_t xfs_aextnum_t; /* # extents in an attribute fork */ -typedef __int64_t xfs_fsize_t; /* bytes in a file */ +typedef __int64_t xfs_fsize_t; /* bytes in a file */ typedef __uint64_t xfs_ufsize_t; /* unsigned bytes in a file */ -typedef __int32_t xfs_suminfo_t; /* type of bitmap summary info */ -typedef __int32_t xfs_rtword_t; /* word type for bitmap manipulations */ +typedef __int32_t xfs_suminfo_t; /* type of bitmap summary info */ +typedef __int32_t xfs_rtword_t; /* word type for bitmap manipulations */ -typedef __int64_t xfs_lsn_t; /* log sequence number */ -typedef __int32_t xfs_tid_t; /* transaction identifier */ +typedef __int64_t xfs_lsn_t; /* log sequence number */ +typedef __int32_t xfs_tid_t; /* transaction identifier */ -typedef __uint32_t xfs_dablk_t; /* dir/attr block number (in file) */ -typedef __uint32_t xfs_dahash_t; /* dir/attr hash value */ +typedef __uint32_t xfs_dablk_t; /* dir/attr block number (in file) */ +typedef __uint32_t xfs_dahash_t; /* dir/attr hash value */ typedef __uint16_t xfs_prid_t; /* prid_t truncated to 16bits in XFS */ @@ -125,23 +125,23 @@ typedef __uint16_t xfs_prid_t; /* prid_t truncated to 16bits in XFS */ */ typedef __uint64_t xfs_dfsbno_t; /* blockno in filesystem (agno|agbno) */ typedef __uint64_t xfs_drfsbno_t; /* blockno in filesystem (raw) */ -typedef __uint64_t xfs_drtbno_t; /* extent (block) in realtime area */ -typedef __uint64_t xfs_dfiloff_t; /* block number in a file */ -typedef __uint64_t xfs_dfilblks_t; /* number of blocks in a file */ +typedef __uint64_t xfs_drtbno_t; /* extent (block) in realtime area */ +typedef __uint64_t xfs_dfiloff_t; /* block number in a file */ +typedef __uint64_t xfs_dfilblks_t; /* number of blocks in a file */ /* * Memory based types are conditional. */ #if XFS_BIG_FILESYSTEMS -typedef __uint64_t xfs_fsblock_t; /* blockno in filesystem (agno|agbno) */ -typedef __uint64_t xfs_rfsblock_t; /* blockno in filesystem (raw) */ +typedef __uint64_t xfs_fsblock_t; /* blockno in filesystem (agno|agbno) */ +typedef __uint64_t xfs_rfsblock_t; /* blockno in filesystem (raw) */ typedef __uint64_t xfs_rtblock_t; /* extent (block) in realtime area */ -typedef __int64_t xfs_srtblock_t; /* signed version of xfs_rtblock_t */ +typedef __int64_t xfs_srtblock_t; /* signed version of xfs_rtblock_t */ #else -typedef __uint32_t xfs_fsblock_t; /* blockno in filesystem (agno|agbno) */ -typedef __uint32_t xfs_rfsblock_t; /* blockno in filesystem (raw) */ +typedef __uint32_t xfs_fsblock_t; /* blockno in filesystem (agno|agbno) */ +typedef __uint32_t xfs_rfsblock_t; /* blockno in filesystem (raw) */ typedef __uint32_t xfs_rtblock_t; /* extent (block) in realtime area */ -typedef __int32_t xfs_srtblock_t; /* signed version of xfs_rtblock_t */ +typedef __int32_t xfs_srtblock_t; /* signed version of xfs_rtblock_t */ #endif typedef __uint64_t xfs_fileoff_t; /* block number in a file */ typedef __int64_t xfs_sfiloff_t; /* signed block number in a file */ @@ -152,28 +152,28 @@ typedef __uint8_t xfs_arch_t; /* architecture of an xfs fs */ /* * Null values for the types. */ -#define NULLDFSBNO ((xfs_dfsbno_t)-1) -#define NULLDRFSBNO ((xfs_drfsbno_t)-1) -#define NULLDRTBNO ((xfs_drtbno_t)-1) -#define NULLDFILOFF ((xfs_dfiloff_t)-1) +#define NULLDFSBNO ((xfs_dfsbno_t)-1) +#define NULLDRFSBNO ((xfs_drfsbno_t)-1) +#define NULLDRTBNO ((xfs_drtbno_t)-1) +#define NULLDFILOFF ((xfs_dfiloff_t)-1) -#define NULLFSBLOCK ((xfs_fsblock_t)-1) -#define NULLRFSBLOCK ((xfs_rfsblock_t)-1) -#define NULLRTBLOCK ((xfs_rtblock_t)-1) -#define NULLFILEOFF ((xfs_fileoff_t)-1) +#define NULLFSBLOCK ((xfs_fsblock_t)-1) +#define NULLRFSBLOCK ((xfs_rfsblock_t)-1) +#define NULLRTBLOCK ((xfs_rtblock_t)-1) +#define NULLFILEOFF ((xfs_fileoff_t)-1) -#define NULLAGBLOCK ((xfs_agblock_t)-1) -#define NULLAGNUMBER ((xfs_agnumber_t)-1) -#define NULLEXTNUM ((xfs_extnum_t)-1) +#define NULLAGBLOCK ((xfs_agblock_t)-1) +#define NULLAGNUMBER ((xfs_agnumber_t)-1) +#define NULLEXTNUM ((xfs_extnum_t)-1) #define NULLCOMMITLSN ((xfs_lsn_t)-1) /* * Max values for extlen, extnum, aextnum. */ -#define MAXEXTLEN ((xfs_extlen_t)0x001fffff) /* 21 bits */ -#define MAXEXTNUM ((xfs_extnum_t)0x7fffffff) /* signed int */ -#define MAXAEXTNUM ((xfs_aextnum_t)0x7fff) /* signed short */ +#define MAXEXTLEN ((xfs_extlen_t)0x001fffff) /* 21 bits */ +#define MAXEXTNUM ((xfs_extnum_t)0x7fffffff) /* signed int */ +#define MAXAEXTNUM ((xfs_aextnum_t)0x7fff) /* signed short */ /* * MAXNAMELEN is the length (including the terminating null) of diff --git a/include/xqm.h b/include/xqm.h index 63c25d6fb..fffdbec7d 100644 --- a/include/xqm.h +++ b/include/xqm.h @@ -69,15 +69,15 @@ typedef struct fs_disk_quota { __s32 d_itimer; /* zero if within inode limits */ /* if not, we refuse service */ __s32 d_btimer; /* similar to above; for disk blocks */ - __u16 d_iwarns; /* # warnings issued wrt num inodes */ - __u16 d_bwarns; /* # warnings issued wrt disk blocks */ + __u16 d_iwarns; /* # warnings issued wrt num inodes */ + __u16 d_bwarns; /* # warnings issued wrt disk blocks */ __s32 d_padding2; /* padding2 - for future use */ __u64 d_rtb_hardlimit;/* absolute limit on realtime blks */ __u64 d_rtb_softlimit;/* preferred limit on RT disk blks */ __u64 d_rtbcount; /* # realtime blocks owned */ __s32 d_rtbtimer; /* similar to above; for RT disk blks */ - __u16 d_rtbwarns; /* # warnings issued wrt RT disk blks */ - __s16 d_padding3; /* padding3 - for future use */ + __u16 d_rtbwarns; /* # warnings issued wrt RT disk blks */ + __s16 d_padding3; /* padding3 - for future use */ char d_padding4[8]; /* yet more padding */ } fs_disk_quota_t; @@ -87,7 +87,7 @@ typedef struct fs_disk_quota { #define FS_DQ_ISOFT (1<<0) #define FS_DQ_IHARD (1<<1) #define FS_DQ_BSOFT (1<<2) -#define FS_DQ_BHARD (1<<3) +#define FS_DQ_BHARD (1<<3) #define FS_DQ_RTBSOFT (1<<4) #define FS_DQ_RTBHARD (1<<5) #define FS_DQ_LIMIT_MASK (FS_DQ_ISOFT | FS_DQ_IHARD | FS_DQ_BSOFT | \ @@ -96,12 +96,12 @@ typedef struct fs_disk_quota { * These timers can only be set in super user's dquot. For others, timers are * automatically started and stopped. Superusers timer values set the limits * for the rest. In case these values are zero, the DQ_{F,B}TIMELIMIT values - * defined below are used. + * defined below are used. * These values also apply only to the d_fieldmask field for Q_XSETQLIM. */ #define FS_DQ_BTIMER (1<<6) #define FS_DQ_ITIMER (1<<7) -#define FS_DQ_RTBTIMER (1<<8) +#define FS_DQ_RTBTIMER (1<<8) #define FS_DQ_TIMER_MASK (FS_DQ_BTIMER | FS_DQ_ITIMER | FS_DQ_RTBTIMER) /* @@ -149,9 +149,9 @@ typedef struct fs_quota_stat { fs_qfilestat_t qs_uquota; /* user quota storage information */ fs_qfilestat_t qs_gquota; /* group quota storage information */ __u32 qs_incoredqs; /* number of dquots incore */ - __s32 qs_btimelimit; /* limit for blks timer */ - __s32 qs_itimelimit; /* limit for inodes timer */ - __s32 qs_rtbtimelimit;/* limit for rt blks timer */ + __s32 qs_btimelimit; /* limit for blks timer */ + __s32 qs_itimelimit; /* limit for inodes timer */ + __s32 qs_rtbtimelimit;/* limit for rt blks timer */ __u16 qs_bwarnlimit; /* limit for num warnings */ __u16 qs_iwarnlimit; /* limit for num warnings */ } fs_quota_stat_t; diff --git a/io/Makefile b/io/Makefile index 6cf4c8d54..a069d67d0 100644 --- a/io/Makefile +++ b/io/Makefile @@ -1,32 +1,32 @@ # # Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # diff --git a/io/bmap.c b/io/bmap.c index 7e8ba0daf..6d2671d33 100644 --- a/io/bmap.c +++ b/io/bmap.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -126,7 +126,7 @@ bmap_f( return usage(); } } - if (aflag) + if (aflag) bmv_iflags &= ~(BMV_IF_PREALLOC|BMV_IF_NO_DMAPI_READ); if (vflag) { @@ -146,11 +146,11 @@ bmap_f( } if (fsx.fsx_xflags == XFS_XFLAG_REALTIME) { - /* + /* * ag info not applicable to rt, continue * without ag output. */ - vflag = 0; + vflag = 0; } } @@ -162,13 +162,13 @@ bmap_f( exitcode = 1; return 0; } - + /* Try the xfsctl(XFS_IOC_GETBMAPX) for the number of extents specified * by nflag, or the initial guess number of extents (256). * * If there are more extents than we guessed, use xfsctl - * (XFS_IOC_FSGETXATTR[A]) to get the extent count, realloc some more + * (XFS_IOC_FSGETXATTR[A]) to get the extent count, realloc some more * space based on this count, and try again. * * If the initial FGETBMAPX attempt returns EINVAL, this may mean @@ -180,12 +180,12 @@ bmap_f( * (1) The extent count may be wrong for a file with delayed * allocation blocks. The XFS_IOC_GETBMAPX forces the real * allocation and fixes up the extent count. - * (2) For XFS_IOC_GETBMAP[X] on a DMAPI file that has been moved - * offline by a DMAPI application (e.g., DMF) the + * (2) For XFS_IOC_GETBMAP[X] on a DMAPI file that has been moved + * offline by a DMAPI application (e.g., DMF) the * XFS_IOC_FSGETXATTR only reflects the extents actually online. * Doing XFS_IOC_GETBMAPX call first forces that data blocks online * and then everything proceeds normally (see PV #545725). - * + * * If you don't want this behavior on a DMAPI offline file, * try the "-d" option which sets the BMV_IF_NO_DMAPI_READ * iflag for XFS_IOC_GETBMAPX. @@ -255,7 +255,7 @@ bmap_f( for (i = 0; i < map->bmv_entries; i++) { printf("\t%d: [%lld..%lld]: ", i, (long long) map[i + 1].bmv_offset, - (long long)(map[i + 1].bmv_offset + + (long long)(map[i + 1].bmv_offset + map[i + 1].bmv_length - 1LL)); if (map[i + 1].bmv_block == -1) printf(_("hole")); @@ -274,9 +274,9 @@ bmap_f( } } else { /* - * Verbose mode displays: + * Verbose mode displays: * extent: [startoffset..endoffset]: startblock..endblock \ - * ag# (agoffset..agendoffset) totalbbs + * ag# (agoffset..agendoffset) totalbbs */ #define MINRANGE_WIDTH 16 #define MINAG_WIDTH 2 @@ -289,49 +289,49 @@ bmap_f( #define FLG_ESW 00001 /* Not on end of stripe width */ int agno; off64_t agoff, bbperag; - int foff_w, boff_w, aoff_w, tot_w, agno_w; - char rbuf[32], bbuf[32], abuf[32]; + int foff_w, boff_w, aoff_w, tot_w, agno_w; + char rbuf[32], bbuf[32], abuf[32]; int sunit, swidth; foff_w = boff_w = aoff_w = MINRANGE_WIDTH; tot_w = MINTOT_WIDTH; - bbperag = (off64_t)fsgeo.agblocks * + bbperag = (off64_t)fsgeo.agblocks * (off64_t)fsgeo.blocksize / BBSIZE; sunit = fsgeo.sunit; swidth = fsgeo.swidth; - /* + /* * Go through the extents and figure out the width * needed for all columns. */ for (i = 0; i < map->bmv_entries; i++) { - snprintf(rbuf, sizeof(rbuf), "[%lld..%lld]:", + snprintf(rbuf, sizeof(rbuf), "[%lld..%lld]:", (long long) map[i + 1].bmv_offset, (long long)(map[i + 1].bmv_offset + map[i + 1].bmv_length - 1LL)); if (map[i + 1].bmv_block == -1) { - foff_w = max(foff_w, strlen(rbuf)); - tot_w = max(tot_w, + foff_w = max(foff_w, strlen(rbuf)); + tot_w = max(tot_w, numlen(map[i+1].bmv_length)); } else { - snprintf(bbuf, sizeof(bbuf), "%lld..%lld", + snprintf(bbuf, sizeof(bbuf), "%lld..%lld", (long long) map[i + 1].bmv_block, (long long)(map[i + 1].bmv_block + map[i + 1].bmv_length - 1LL)); agno = map[i + 1].bmv_block / bbperag; agoff = map[i + 1].bmv_block - (agno * bbperag); - snprintf(abuf, sizeof(abuf), "(%lld..%lld)", + snprintf(abuf, sizeof(abuf), "(%lld..%lld)", (long long)agoff, (long long) (agoff + map[i + 1].bmv_length - 1LL)); - foff_w = max(foff_w, strlen(rbuf)); - boff_w = max(boff_w, strlen(bbuf)); - aoff_w = max(aoff_w, strlen(abuf)); - tot_w = max(tot_w, + foff_w = max(foff_w, strlen(rbuf)); + boff_w = max(boff_w, strlen(bbuf)); + aoff_w = max(aoff_w, strlen(abuf)); + tot_w = max(tot_w, numlen(map[i+1].bmv_length)); } } agno_w = max(MINAG_WIDTH, numlen(fsgeo.agcount)); - printf("%4s: %-*s %-*s %*s %-*s %*s\n", + printf("%4s: %-*s %-*s %*s %-*s %*s\n", _("EXT"), foff_w, _("FILE-OFFSET"), boff_w, _("BLOCK-RANGE"), @@ -344,46 +344,46 @@ bmap_f( if (map[i + 1].bmv_block % sunit != 0) { flg |= FLG_BSU; } - if (((map[i + 1].bmv_block + + if (((map[i + 1].bmv_block + map[i + 1].bmv_length ) % sunit ) != 0) { flg |= FLG_ESU; } if (map[i + 1].bmv_block % swidth != 0) { flg |= FLG_BSW; } - if (((map[i + 1].bmv_block + + if (((map[i + 1].bmv_block + map[i + 1].bmv_length ) % swidth ) != 0) { flg |= FLG_ESW; } } - snprintf(rbuf, sizeof(rbuf), "[%lld..%lld]:", + snprintf(rbuf, sizeof(rbuf), "[%lld..%lld]:", (long long) map[i + 1].bmv_offset, (long long)(map[i + 1].bmv_offset + map[i + 1].bmv_length - 1LL)); if (map[i + 1].bmv_block == -1) { - printf("%4d: %-*s %-*s %*s %-*s %*lld\n", - i, - foff_w, rbuf, + printf("%4d: %-*s %-*s %*s %-*s %*lld\n", + i, + foff_w, rbuf, boff_w, _("hole"), agno_w, "", - aoff_w, "", + aoff_w, "", tot_w, (long long)map[i+1].bmv_length); } else { - snprintf(bbuf, sizeof(bbuf), "%lld..%lld", + snprintf(bbuf, sizeof(bbuf), "%lld..%lld", (long long) map[i + 1].bmv_block, (long long)(map[i + 1].bmv_block + map[i + 1].bmv_length - 1LL)); agno = map[i + 1].bmv_block / bbperag; agoff = map[i + 1].bmv_block - (agno * bbperag); - snprintf(abuf, sizeof(abuf), "(%lld..%lld)", + snprintf(abuf, sizeof(abuf), "(%lld..%lld)", (long long)agoff, (long long) (agoff + map[i + 1].bmv_length - 1LL)); printf("%4d: %-*s %-*s %*d %-*s %*lld", - i, - foff_w, rbuf, - boff_w, bbuf, - agno_w, agno, - aoff_w, abuf, + i, + foff_w, rbuf, + boff_w, bbuf, + agno_w, agno, + aoff_w, abuf, tot_w, (long long)map[i+1].bmv_length); if (flg == FLG_NULL) { printf("\n"); diff --git a/io/command.c b/io/command.c index af7ea0e3f..7b798365f 100644 --- a/io/command.c +++ b/io/command.c @@ -1,35 +1,35 @@ /* * Copyright (c) 2003 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ - + #include #include "command.h" diff --git a/io/command.h b/io/command.h index 4890a8a96..3b7380916 100644 --- a/io/command.h +++ b/io/command.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/io/fsync.c b/io/fsync.c index fd712ef75..2dfd1f77f 100644 --- a/io/fsync.c +++ b/io/fsync.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2003 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/io/help.c b/io/help.c index eca80eff2..caaa7f160 100644 --- a/io/help.c +++ b/io/help.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2003 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/io/init.c b/io/init.c index a6d2dc2ff..16e6b0f46 100644 --- a/io/init.c +++ b/io/init.c @@ -1,35 +1,35 @@ /* * Copyright (c) 2003 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ - + #include #include "input.h" #include "command.h" diff --git a/io/init.h b/io/init.h index a49a15e8e..74ba7aad5 100644 --- a/io/init.h +++ b/io/init.h @@ -1,35 +1,35 @@ /* * Copyright (c) 2003 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ - + extern int fdesc; extern char *fname; extern int exitcode; diff --git a/io/input.c b/io/input.c index c91e824da..c3d0c01d7 100644 --- a/io/input.c +++ b/io/input.c @@ -1,35 +1,35 @@ /* * Copyright (c) 2003 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ - + #include #include "input.h" #include "init.h" diff --git a/io/input.h b/io/input.h index b4971466f..685157c18 100644 --- a/io/input.h +++ b/io/input.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/io/open.c b/io/open.c index 0f5075d5b..4997b3a73 100644 --- a/io/open.c +++ b/io/open.c @@ -1,35 +1,35 @@ /* * Copyright (c) 2003 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ - + #include #include "command.h" #include "init.h" diff --git a/io/pread.c b/io/pread.c index 7fb7d052d..1859046de 100644 --- a/io/pread.c +++ b/io/pread.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2003 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/io/prealloc.c b/io/prealloc.c index b2b18cf92..c92838752 100644 --- a/io/prealloc.c +++ b/io/prealloc.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2003 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/io/pwrite.c b/io/pwrite.c index bdf97475a..528ceaa3a 100644 --- a/io/pwrite.c +++ b/io/pwrite.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2003 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/io/quit.c b/io/quit.c index 731eb3a29..a72ed944e 100644 --- a/io/quit.c +++ b/io/quit.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2003 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/io/resblks.c b/io/resblks.c index 07787d096..5774fc73a 100644 --- a/io/resblks.c +++ b/io/resblks.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2003 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/io/truncate.c b/io/truncate.c index 80bdce268..be420dde7 100644 --- a/io/truncate.c +++ b/io/truncate.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2003 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/io/xfs_bmap.sh b/io/xfs_bmap.sh index ed63122a7..b30b7c025 100755 --- a/io/xfs_bmap.sh +++ b/io/xfs_bmap.sh @@ -1,33 +1,33 @@ #!/bin/sh -f # # Copyright (c) 2003 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # diff --git a/libdisk/Makefile b/libdisk/Makefile index 2be109658..9be1de3a8 100644 --- a/libdisk/Makefile +++ b/libdisk/Makefile @@ -1,32 +1,32 @@ # # Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # diff --git a/libdisk/drivers.c b/libdisk/drivers.c index 194209352..bd16067ab 100644 --- a/libdisk/drivers.c +++ b/libdisk/drivers.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -45,7 +45,7 @@ get_subvol_stripe_wrapper(char *dev, sv_type_t type, int *sunit, int *swidth) dev, strerror(errno)); exit(1); } - + if ( md_get_subvol_stripe(dev, type, sunit, swidth, &sb)) return; if ( lvm_get_subvol_stripe(dev, type, sunit, swidth, &sb)) diff --git a/libdisk/drivers.h b/libdisk/drivers.h index f6487cf55..ad8634c6e 100644 --- a/libdisk/drivers.h +++ b/libdisk/drivers.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/libdisk/evms.c b/libdisk/evms.c index 67d2b3bce..3153e7a69 100644 --- a/libdisk/evms.c +++ b/libdisk/evms.c @@ -3,16 +3,16 @@ * * 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 - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See * the GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/libdisk/evms.h b/libdisk/evms.h index daa105fb3..aab797b01 100644 --- a/libdisk/evms.h +++ b/libdisk/evms.h @@ -3,16 +3,16 @@ * * 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 - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See * the GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/libdisk/fstype.c b/libdisk/fstype.c index a527be91b..147b16d43 100644 --- a/libdisk/fstype.c +++ b/libdisk/fstype.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -168,9 +168,9 @@ may_be_adfs(const u_char *s) { static int is_reiserfs_magic_string (struct reiserfs_super_block * rs) { - return (!strncmp (rs->s_magic, REISERFS_SUPER_MAGIC_STRING, + return (!strncmp (rs->s_magic, REISERFS_SUPER_MAGIC_STRING, strlen ( REISERFS_SUPER_MAGIC_STRING)) || - !strncmp (rs->s_magic, REISER2FS_SUPER_MAGIC_STRING, + !strncmp (rs->s_magic, REISER2FS_SUPER_MAGIC_STRING, strlen ( REISER2FS_SUPER_MAGIC_STRING))); } @@ -302,32 +302,32 @@ fstype(const char *device) { if (!type) { /* block 1 */ - if (lseek(fd, 0x400, SEEK_SET) != 0x400 - || read(fd, (char *) &hfssb, sizeof(hfssb)) != sizeof(hfssb)) - goto io_error; - - /* also check if block size is equal to 512 bytes, - since the hfs driver currently only has support - for block sizes of 512 bytes long, and to be - more accurate (sb magic is only a short int) */ - if ((hfsmagic(hfssb) == HFS_SUPER_MAGIC && + if (lseek(fd, 0x400, SEEK_SET) != 0x400 + || read(fd, (char *) &hfssb, sizeof(hfssb)) != sizeof(hfssb)) + goto io_error; + + /* also check if block size is equal to 512 bytes, + since the hfs driver currently only has support + for block sizes of 512 bytes long, and to be + more accurate (sb magic is only a short int) */ + if ((hfsmagic(hfssb) == HFS_SUPER_MAGIC && hfsblksize(hfssb) == 0x20000) || - (swapped(hfsmagic(hfssb)) == HFS_SUPER_MAGIC && - hfsblksize(hfssb) == 0x200)) - type = "hfs"; + (swapped(hfsmagic(hfssb)) == HFS_SUPER_MAGIC && + hfsblksize(hfssb) == 0x200)) + type = "hfs"; } if (!type) { /* block 3 */ - if (lseek(fd, 0xc00, SEEK_SET) != 0xc00 - || read(fd, (char *) &adfssb, sizeof(adfssb)) != sizeof(adfssb)) - goto io_error; + if (lseek(fd, 0xc00, SEEK_SET) != 0xc00 + || read(fd, (char *) &adfssb, sizeof(adfssb)) != sizeof(adfssb)) + goto io_error; /* only a weak test */ - if (may_be_adfs((u_char *) &adfssb) - && (adfsblksize(adfssb) >= 8 && - adfsblksize(adfssb) <= 10)) - type = "adfs"; + if (may_be_adfs((u_char *) &adfssb) + && (adfsblksize(adfssb) >= 8 && + adfsblksize(adfssb) <= 10)) + type = "adfs"; } if (!type) { @@ -356,12 +356,12 @@ fstype(const char *device) { if (!type) { /* block 8 */ - if (lseek(fd, 0x2000, SEEK_SET) != 0x2000 - || read(fd, (char *) &hpfssb, sizeof(hpfssb)) != sizeof(hpfssb)) - goto io_error; + if (lseek(fd, 0x2000, SEEK_SET) != 0x2000 + || read(fd, (char *) &hpfssb, sizeof(hpfssb)) != sizeof(hpfssb)) + goto io_error; - if (hpfsmagic(hpfssb) == HPFS_SUPER_MAGIC) - type = "hpfs"; + if (hpfsmagic(hpfssb) == HPFS_SUPER_MAGIC) + type = "hpfs"; } if (!type) { diff --git a/libdisk/fstype.h b/libdisk/fstype.h index f94a27c14..ac29cda03 100644 --- a/libdisk/fstype.h +++ b/libdisk/fstype.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -85,14 +85,14 @@ struct ext_super_block { #define EXT2_SUPER_MAGIC 0xEF53 #define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004 struct ext2_super_block { - u_char s_dummy1[56]; - u_char s_magic[2]; + u_char s_dummy1[56]; + u_char s_magic[2]; u_char s_dummy2[34]; u_char s_feature_compat[4]; u_char s_feature_incompat[4]; u_char s_feature_ro_compat[4]; u_char s_uuid[16]; - u_char s_volume_name[16]; + u_char s_volume_name[16]; u_char s_dummy3[88]; u_char s_journal_inum[4]; /* ext3 only */ }; @@ -158,7 +158,7 @@ struct fat_super_block { u_char s_dummy2[32]; u_char s_label[11]; /* for DOS? */ u_char s_fs[8]; /* "FAT12 " or "FAT16 " or all zero */ - /* OS/2 BM has "FAT " here. */ + /* OS/2 BM has "FAT " here. */ u_char s_dummy3[9]; u_char s_label2[11]; /* for Windows? */ u_char s_fs2[8]; /* garbage or "FAT32 " */ diff --git a/libdisk/lvm.c b/libdisk/lvm.c index 579550a03..226ca2c75 100644 --- a/libdisk/lvm.c +++ b/libdisk/lvm.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/libdisk/md.c b/libdisk/md.c index 2aee6d290..64009bf90 100644 --- a/libdisk/md.c +++ b/libdisk/md.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/libdisk/pttype.c b/libdisk/pttype.c index f8351c135..265d6b6cc 100644 --- a/libdisk/pttype.c +++ b/libdisk/pttype.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -68,7 +68,7 @@ sgi_parttable(char *base) static int dos_parttable(char *base) { - return (base[510] == 0x55 && base[511] == 0xaa); + return (base[510] == 0x55 && base[511] == 0xaa); } static int @@ -85,7 +85,7 @@ sun_parttable(char *base) int csum = 0; if (sunlabel(base)->magic != SUN_LABEL_MAGIC && - sunlabel(base)->magic != SUN_LABEL_MAGIC_SWAPPED) + sunlabel(base)->magic != SUN_LABEL_MAGIC_SWAPPED) return csum; ush = ((unsigned short *) (sunlabel(base) + 1)) - 1; while (ush >= (unsigned short *)sunlabel(base)) diff --git a/libdisk/pttype.h b/libdisk/pttype.h index e7b32580b..4f35c471e 100644 --- a/libdisk/pttype.h +++ b/libdisk/pttype.h @@ -1,4 +1,3 @@ - typedef struct { unsigned char info[128]; /* Informative text string */ unsigned char spare0[14]; @@ -30,7 +29,7 @@ typedef struct { #define SUN_LABEL_MAGIC 0xDABE #define SUN_LABEL_MAGIC_SWAPPED 0xBEDA #define sunlabel(x) ((sun_partition *)x) - + typedef struct { unsigned int magic; /* expect AIX_LABEL_MAGIC */ /* ... */ diff --git a/libdisk/xvm.c b/libdisk/xvm.c index cdc6b448b..dc4612ff5 100644 --- a/libdisk/xvm.c +++ b/libdisk/xvm.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/libdisk/xvm.h b/libdisk/xvm.h index 122efdfe8..c4c6ded5c 100644 --- a/libdisk/xvm.h +++ b/libdisk/xvm.h @@ -41,11 +41,11 @@ */ #define XVM_GETDEV_VERS 1 typedef struct { - __uint32_t version; - dev_t data_subvol_dev; + __uint32_t version; + dev_t data_subvol_dev; - dev_t log_subvol_dev; - dev_t rt_subvol_dev; + dev_t log_subvol_dev; + dev_t rt_subvol_dev; dev_t sp_subvol_dev; } xvm_getdev_t; @@ -56,10 +56,9 @@ typedef struct { */ #define XVM_SUBVOL_GEOMETRY_VERS 1 typedef struct xvm_subvol_stripe_s { - __uint32_t version; - __uint32_t unit_size; /* in blocks */ - __uint32_t width_size; /* in blocks */ + __uint32_t version; + __uint32_t unit_size; /* in blocks */ + __uint32_t width_size; /* in blocks */ __uint32_t pad1; /* padding */ dev_t dev; } xvm_subvol_stripe_t; - diff --git a/libhandle/Makefile b/libhandle/Makefile index a75cc67ed..898ec6f5e 100644 --- a/libhandle/Makefile +++ b/libhandle/Makefile @@ -1,32 +1,32 @@ # # Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # diff --git a/libhandle/handle.c b/libhandle/handle.c index 572cb8da4..07fb296e8 100644 --- a/libhandle/handle.c +++ b/libhandle/handle.c @@ -229,7 +229,7 @@ obj_to_handle ( if (ret) return ret; - *hanp = malloc(*hlen); + *hanp = malloc(*hlen); if (*hanp == NULL) { errno = ENOMEM; return -1; diff --git a/libhandle/jdm.c b/libhandle/jdm.c index 6407c5f92..91ea76a8b 100644 --- a/libhandle/jdm.c +++ b/libhandle/jdm.c @@ -75,7 +75,7 @@ jdm_getfshandle( char *mntpnt ) { fshandle_t *fshandlep; size_t fshandlesz; - char resolved[MAXPATHLEN]; + char resolved[MAXPATHLEN]; /* sanity checks */ ASSERT( sizeof( fshandle_t ) == FSHANDLE_SZ ); @@ -90,15 +90,15 @@ jdm_getfshandle( char *mntpnt ) fshandlep = 0; /* for lint */ fshandlesz = sizeof( *fshandlep ); - - if (!realpath( mntpnt, resolved )) - return NULL; - + + if (!realpath( mntpnt, resolved )) + return NULL; + if (path_to_fshandle( resolved, ( void ** )&fshandlep, &fshandlesz )) return NULL; - + assert( fshandlesz == sizeof( *fshandlep )); - + return ( jdm_fshandle_t * )fshandlep; } diff --git a/libxfs/Makefile b/libxfs/Makefile index efbe4981f..4bb6839eb 100644 --- a/libxfs/Makefile +++ b/libxfs/Makefile @@ -1,32 +1,32 @@ # # Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # @@ -51,13 +51,13 @@ CFILES += $(PKG_PLATFORM).c PCFILES = darwin.c freebsd.c irix.c linux.c LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g") -# +# # Tracing flags: # -DIO_DEBUG reads and writes of buffers # -DMEM_DEBUG all zone memory use # -DLI_DEBUG log item (ino/buf) manipulation # -DXACT_DEBUG transaction state changes -# +# LCFLAGS += -I. # don't try linking xfs_repair with a debug libxfs. diff --git a/libxfs/freebsd.c b/libxfs/freebsd.c index ecb81f190..a9075a079 100644 --- a/libxfs/freebsd.c +++ b/libxfs/freebsd.c @@ -84,11 +84,11 @@ platform_flush_device(int fd) static __int64_t getdisksize(int fd, const char *fname) { - //struct diskslices ds; - struct disklabel dl, *lp; - const char *s1, *s2; - char *s; - int slice, part, fd1, i, e; + //struct diskslices ds; + struct disklabel dl, *lp; + const char *s1, *s2; + char *s; + int slice, part, fd1, i, e; __int64_t size = 0LL; slice = part = -1; @@ -127,7 +127,7 @@ getdisksize(int fd, const char *fname) if (i == -1 && slice != -1 && part == -1) { e = errno; if (!(s = strdup(fname))) { - fprintf(stderr, "%s: %s\n", + fprintf(stderr, "%s: %s\n", progname, strerror(errno)); exit(1); } @@ -155,7 +155,7 @@ getdisksize(int fd, const char *fname) exit(1); } size = lp->d_partitions[part].p_size; - } + } } return size; } @@ -166,7 +166,7 @@ platform_findsize(char *path) int fd; struct stat st; __int64_t size; - + /* Test to see if we are dealing with a regular file rather than a * block device, if we are just use the size returned by stat64 */ @@ -188,7 +188,7 @@ platform_findsize(char *path) } size = getdisksize(fd, path); - + close(fd); return size; diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c index 128b57fb6..14ade5de7 100644 --- a/libxfs/rdwr.c +++ b/libxfs/rdwr.c @@ -60,7 +60,7 @@ libxfs_device_zero(dev_t dev, xfs_daddr_t start, uint len) if (bno + nblks > start + len) nblks = (uint)(start + len - bno); if (pwrite64(fd, z, BBTOB(nblks), BBTOOFF64(bno)) < - BBTOB(nblks)) { + BBTOB(nblks)) { fprintf(stderr, _("%s: %s write failed: %s\n"), progname, __FUNCTION__, strerror(errno)); diff --git a/libxfs/xfs.h b/libxfs/xfs.h index 6f5511212..0c0272a18 100644 --- a/libxfs/xfs.h +++ b/libxfs/xfs.h @@ -40,7 +40,7 @@ * * It should only ever be #include'd by XFS "kernel" code being * compiled in user space. - * + * * Our goals here are to... * o "share" large amounts of complex code between user and * kernel space; @@ -138,7 +138,7 @@ #define xfs_da_shrink_inode libxfs_da_shrink_inode #define xfs_da_grow_inode libxfs_da_grow_inode #define xfs_da_brelse libxfs_da_brelse -#define xfs_da_read_buf libxfs_da_read_buf +#define xfs_da_read_buf libxfs_da_read_buf #define xfs_da_get_buf libxfs_da_get_buf #define xfs_da_log_buf libxfs_da_log_buf #define xfs_da_do_buf libxfs_da_do_buf @@ -191,7 +191,7 @@ /* memory management */ #define KM_SLEEP 1 #define KM_SLEEP_IO 2 -#define kmem_zone xfs_zone +#define kmem_zone xfs_zone #define kmem_zone_t xfs_zone_t #define kmem_zone_init(a, b) libxfs_zone_init(a, b) #define kmem_zone_alloc(z, f) libxfs_zone_zalloc(z) @@ -465,13 +465,13 @@ void xfs_bmbt_set_all (xfs_bmbt_rec_t *, xfs_bmbt_irec_t *); void xfs_bmbt_set_allf (xfs_bmbt_rec_t *, xfs_fileoff_t, xfs_fsblock_t, xfs_filblks_t, xfs_exntst_t); void xfs_bmbt_set_blockcount (xfs_bmbt_rec_t *, xfs_filblks_t); -void xfs_bmbt_set_startblock (xfs_bmbt_rec_t *, xfs_fsblock_t); +void xfs_bmbt_set_startblock (xfs_bmbt_rec_t *, xfs_fsblock_t); void xfs_bmbt_set_startoff (xfs_bmbt_rec_t *, xfs_fileoff_t); void xfs_bmbt_set_state (xfs_bmbt_rec_t *, xfs_exntst_t); void xfs_bmbt_log_block (struct xfs_btree_cur *, struct xfs_buf *, int); void xfs_bmbt_log_recs (struct xfs_btree_cur *, struct xfs_buf *, int, int); int xfs_bmbt_lookup_eq (struct xfs_btree_cur *, xfs_fileoff_t, xfs_fsblock_t, - xfs_filblks_t, int *); + xfs_filblks_t, int *); xfs_fsblock_t xfs_bmbt_get_startblock (xfs_bmbt_rec_t *); xfs_filblks_t xfs_bmbt_get_blockcount (xfs_bmbt_rec_t *); xfs_fileoff_t xfs_bmbt_get_startoff (xfs_bmbt_rec_t *); @@ -483,7 +483,7 @@ int xfs_bmbt_insert (struct xfs_btree_cur *, int *); int xfs_bmbt_decrement (struct xfs_btree_cur *, int, int *); int xfs_bmbt_delete (struct xfs_btree_cur *, int *); int xfs_bmbt_update (struct xfs_btree_cur *, xfs_fileoff_t, xfs_fsblock_t, - xfs_filblks_t, xfs_exntst_t); + xfs_filblks_t, xfs_exntst_t); void xfs_bmbt_to_bmdr (xfs_bmbt_block_t *, int, xfs_bmdr_block_t *, int); void xfs_bmdr_to_bmbt (xfs_bmdr_block_t *, int, xfs_bmbt_block_t *, int); #if ARCH_CONVERT != ARCH_NOCONVERT diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c index 57bdfbde4..6af093941 100644 --- a/libxfs/xfs_alloc.c +++ b/libxfs/xfs_alloc.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -134,7 +134,7 @@ xfs_alloc_compute_diff( */ STATIC void xfs_alloc_fix_len( - xfs_alloc_arg_t *args) /* allocation argument structure */ + xfs_alloc_arg_t *args) /* allocation argument structure */ { xfs_extlen_t k; xfs_extlen_t rlen; @@ -168,7 +168,7 @@ xfs_alloc_fix_len( */ STATIC int xfs_alloc_fix_minleft( - xfs_alloc_arg_t *args) /* allocation argument structure */ + xfs_alloc_arg_t *args) /* allocation argument structure */ { xfs_agf_t *agf; /* a.g. freelist header */ int diff; /* free space difference */ @@ -197,8 +197,8 @@ xfs_alloc_fix_minleft( */ STATIC int /* error code */ xfs_alloc_fixup_trees( - xfs_btree_cur_t *cnt_cur, /* cursor for by-size btree */ - xfs_btree_cur_t *bno_cur, /* cursor for by-block btree */ + xfs_btree_cur_t *cnt_cur, /* cursor for by-size btree */ + xfs_btree_cur_t *bno_cur, /* cursor for by-block btree */ xfs_agblock_t fbno, /* starting block of free extent */ xfs_extlen_t flen, /* length of free extent */ xfs_agblock_t rbno, /* starting block of returned extent */ @@ -368,7 +368,7 @@ STATIC void xfs_alloc_trace_alloc( char *name, /* function tag string */ char *str, /* additional string */ - xfs_alloc_arg_t *args, /* allocation argument structure */ + xfs_alloc_arg_t *args, /* allocation argument structure */ int line) /* source line number */ { ktrace_enter(xfs_alloc_trace_buf, @@ -470,7 +470,7 @@ xfs_alloc_trace_modagf( */ STATIC int /* error */ xfs_alloc_ag_vextent( - xfs_alloc_arg_t *args) /* argument structure for allocation */ + xfs_alloc_arg_t *args) /* argument structure for allocation */ { int error=0; #ifdef XFS_ALLOC_TRACE @@ -550,10 +550,10 @@ xfs_alloc_ag_vextent( */ STATIC int /* error */ xfs_alloc_ag_vextent_exact( - xfs_alloc_arg_t *args) /* allocation argument structure */ + xfs_alloc_arg_t *args) /* allocation argument structure */ { - xfs_btree_cur_t *bno_cur;/* by block-number btree cursor */ - xfs_btree_cur_t *cnt_cur;/* by count btree cursor */ + xfs_btree_cur_t *bno_cur;/* by block-number btree cursor */ + xfs_btree_cur_t *cnt_cur;/* by count btree cursor */ xfs_agblock_t end; /* end of allocated extent */ int error; xfs_agblock_t fbno; /* start block of found extent */ @@ -563,8 +563,8 @@ xfs_alloc_ag_vextent_exact( static char fname[] = "xfs_alloc_ag_vextent_exact"; #endif int i; /* success/failure of operation */ - xfs_agblock_t maxend; /* end of maximal extent */ - xfs_agblock_t minend; /* end of minimal extent */ + xfs_agblock_t maxend; /* end of maximal extent */ + xfs_agblock_t minend; /* end of minimal extent */ xfs_extlen_t rlen; /* length of returned extent */ ASSERT(args->alignment == 1); @@ -657,11 +657,11 @@ error0: */ STATIC int /* error */ xfs_alloc_ag_vextent_near( - xfs_alloc_arg_t *args) /* allocation argument structure */ + xfs_alloc_arg_t *args) /* allocation argument structure */ { - xfs_btree_cur_t *bno_cur_gt; /* cursor for bno btree, right side */ - xfs_btree_cur_t *bno_cur_lt; /* cursor for bno btree, left side */ - xfs_btree_cur_t *cnt_cur; /* cursor for count btree */ + xfs_btree_cur_t *bno_cur_gt; /* cursor for bno btree, right side */ + xfs_btree_cur_t *bno_cur_lt; /* cursor for bno btree, left side */ + xfs_btree_cur_t *cnt_cur; /* cursor for count btree */ #ifdef XFS_ALLOC_TRACE static char fname[] = "xfs_alloc_ag_vextent_near"; #endif @@ -1196,10 +1196,10 @@ xfs_alloc_ag_vextent_near( */ STATIC int /* error */ xfs_alloc_ag_vextent_size( - xfs_alloc_arg_t *args) /* allocation argument structure */ + xfs_alloc_arg_t *args) /* allocation argument structure */ { - xfs_btree_cur_t *bno_cur; /* cursor for bno btree */ - xfs_btree_cur_t *cnt_cur; /* cursor for cnt btree */ + xfs_btree_cur_t *bno_cur; /* cursor for bno btree */ + xfs_btree_cur_t *cnt_cur; /* cursor for cnt btree */ int error; /* error result */ xfs_agblock_t fbno; /* start of found freespace */ xfs_extlen_t flen; /* length of found freespace */ @@ -1352,10 +1352,10 @@ error0: */ STATIC int /* error */ xfs_alloc_ag_vextent_small( - xfs_alloc_arg_t *args, /* allocation argument structure */ - xfs_btree_cur_t *ccur, /* by-size cursor */ - xfs_agblock_t *fbnop, /* result block number */ - xfs_extlen_t *flenp, /* result length */ + xfs_alloc_arg_t *args, /* allocation argument structure */ + xfs_btree_cur_t *ccur, /* by-size cursor */ + xfs_agblock_t *fbnop, /* result block number */ + xfs_extlen_t *flenp, /* result length */ int *stat) /* status: 0-freelist, 1-normal/none */ { int error; @@ -1439,14 +1439,14 @@ error0: STATIC int /* error */ xfs_free_ag_extent( xfs_trans_t *tp, /* transaction pointer */ - xfs_buf_t *agbp, /* buffer for a.g. freelist header */ + xfs_buf_t *agbp, /* buffer for a.g. freelist header */ xfs_agnumber_t agno, /* allocation group number */ xfs_agblock_t bno, /* starting block number */ xfs_extlen_t len, /* length of extent */ int isfl) /* set if is freelist blocks - no sb acctg */ { - xfs_btree_cur_t *bno_cur; /* cursor for by-block btree */ - xfs_btree_cur_t *cnt_cur; /* cursor for by-size btree */ + xfs_btree_cur_t *bno_cur; /* cursor for by-block btree */ + xfs_btree_cur_t *cnt_cur; /* cursor for by-size btree */ int error; /* error return value */ #ifdef XFS_ALLOC_TRACE static char fname[] = "xfs_free_ag_extent"; @@ -1694,7 +1694,7 @@ xfs_free_ag_extent( * used in xfs_bmap_finish, we can't allow block to be available * for reallocation and non-transaction writing (user data) * until we know that the transaction that moved it to the free - * list is permanently on disk. We track the blocks by declaring + * list is permanently on disk. We track the blocks by declaring * these blocks as "busy"; the busy list is maintained on a per-ag * basis and each transaction records which entries should be removed * when the iclog commits to disk. If a busy block is allocated, @@ -1746,7 +1746,7 @@ xfs_alloc_compute_maxlevels( */ int /* error */ xfs_alloc_fix_freelist( - xfs_alloc_arg_t *args, /* allocation argument structure */ + xfs_alloc_arg_t *args, /* allocation argument structure */ int flags) /* XFS_ALLOC_FLAG_... */ { xfs_buf_t *agbp; /* agf buffer pointer */ @@ -1759,7 +1759,7 @@ xfs_alloc_fix_freelist( xfs_mount_t *mp; /* file system mount point structure */ xfs_extlen_t need; /* total blocks needed in freelist */ xfs_perag_t *pag; /* per-ag information structure */ - xfs_alloc_arg_t targs; /* local allocation arguments */ + xfs_alloc_arg_t targs; /* local allocation arguments */ xfs_trans_t *tp; /* transaction pointer */ mp = args->mp; @@ -1879,8 +1879,8 @@ xfs_alloc_fix_freelist( if ((error = xfs_alloc_ag_vextent(&targs))) return error; /* - * Stop if we run out. Won't happen if callers are obeying - * the restrictions correctly. Can happen for free calls + * Stop if we run out. Won't happen if callers are obeying + * the restrictions correctly. Can happen for free calls * on a completely full ag. */ if (targs.agbno == NULLAGBLOCK) @@ -1955,7 +1955,7 @@ xfs_alloc_get_freelist( * As blocks are freed, they are added to the per-ag busy list * and remain there until the freeing transaction is committed to * disk. Now that we have allocated blocks, this list must be - * searched to see if a block is being reused. If one is, then + * searched to see if a block is being reused. If one is, then * the freeing transaction must be pushed to disk NOW by forcing * to disk all iclogs up that transaction's LSN. */ @@ -1970,7 +1970,7 @@ void xfs_alloc_log_agf( xfs_trans_t *tp, /* transaction pointer */ xfs_buf_t *bp, /* buffer for a.g. freelist header */ - int fields) /* mask of fields to be logged (XFS_AGF_...) */ + int fields) /* mask of fields to be logged (XFS_AGF_...) */ { int first; /* first byte offset */ int last; /* last byte offset */ @@ -2147,9 +2147,9 @@ xfs_alloc_read_agf( */ int /* error */ xfs_alloc_vextent( - xfs_alloc_arg_t *args) /* allocation argument structure */ + xfs_alloc_arg_t *args) /* allocation argument structure */ { - xfs_agblock_t agsize; /* allocation group size */ + xfs_agblock_t agsize; /* allocation group size */ int error; int flags; /* XFS_ALLOC_FLAG_... locking flags */ #ifdef XFS_ALLOC_TRACE @@ -2158,7 +2158,7 @@ xfs_alloc_vextent( xfs_extlen_t minleft;/* minimum left value, temp copy */ xfs_mount_t *mp; /* mount structure pointer */ xfs_agnumber_t sagno; /* starting allocation group number */ - xfs_alloctype_t type; /* input allocation type */ + xfs_alloctype_t type; /* input allocation type */ int bump_rotor = 0; int no_min = 0; @@ -2353,7 +2353,7 @@ xfs_free_extent( #ifdef DEBUG xfs_agf_t *agf; /* a.g. freespace header */ #endif - xfs_alloc_arg_t args; /* allocation argument structure */ + xfs_alloc_arg_t args; /* allocation argument structure */ int error; ASSERT(len != 0); diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c index 53751ca04..1fc539cc5 100644 --- a/libxfs/xfs_alloc_btree.c +++ b/libxfs/xfs_alloc_btree.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -49,7 +49,7 @@ xfs_alloc_delrec( int *stat) /* fail/done/go-on */ { xfs_agf_t *agf; /* allocation group freelist header */ - xfs_alloc_block_t *block; /* btree block record/key lives in */ + xfs_alloc_block_t *block; /* btree block record/key lives in */ xfs_agblock_t bno; /* btree block number */ xfs_buf_t *bp; /* buffer for block */ int error; /* error return value */ @@ -66,7 +66,7 @@ xfs_alloc_delrec( int ptr; /* index in btree block for this rec */ xfs_agblock_t rbno; /* right block's block number */ xfs_buf_t *rbp; /* right block's buffer pointer */ - xfs_alloc_block_t *right; /* right btree block */ + xfs_alloc_block_t *right; /* right btree block */ xfs_alloc_key_t *rkp; /* right block key pointer */ xfs_alloc_ptr_t *rpp; /* right block address pointer */ int rrecs=0; /* number of records in right block */ @@ -122,7 +122,7 @@ xfs_alloc_delrec( } } /* - * It's a leaf. Excise the record being deleted, by sliding the + * It's a leaf. Excise the record being deleted, by sliding the * entries past it down one. Log the changed areas of the block. */ else { @@ -436,7 +436,7 @@ xfs_alloc_delrec( } /* * Otherwise, we can't fix the imbalance. - * Just return. This is probably a logic error, but it's not fatal. + * Just return. This is probably a logic error, but it's not fatal. */ else { if (level > 0 && (error = xfs_alloc_decrement(cur, level, &i))) @@ -470,7 +470,7 @@ xfs_alloc_delrec( INT_GET(left->bb_numrecs, ARCH_CONVERT) + INT_GET(right->bb_numrecs, ARCH_CONVERT)); } else { /* - * It's a leaf. Move records. + * It's a leaf. Move records. */ lrp = XFS_ALLOC_REC_ADDR(left, INT_GET(left->bb_numrecs, ARCH_CONVERT) + 1, cur); rrp = XFS_ALLOC_REC_ADDR(right, 1, cur); @@ -570,11 +570,11 @@ xfs_alloc_insrec( int level, /* level to insert record at */ xfs_agblock_t *bnop, /* i/o: block number inserted */ xfs_alloc_rec_t *recp, /* i/o: record data inserted */ - xfs_btree_cur_t **curp, /* output: new cursor replacing cur */ + xfs_btree_cur_t **curp, /* output: new cursor replacing cur */ int *stat) /* output: success/failure */ { xfs_agf_t *agf; /* allocation group freelist header */ - xfs_alloc_block_t *block; /* btree block record/key lives in */ + xfs_alloc_block_t *block; /* btree block record/key lives in */ xfs_buf_t *bp; /* buffer for block */ int error; /* error return value */ int i; /* loop index */ @@ -801,7 +801,7 @@ STATIC void xfs_alloc_log_block( xfs_trans_t *tp, /* transaction pointer */ xfs_buf_t *bp, /* buffer containing btree block */ - int fields) /* mask of fields: XFS_BB_... */ + int fields) /* mask of fields: XFS_BB_... */ { int first; /* first byte offset logged */ int last; /* last byte offset logged */ @@ -824,11 +824,11 @@ xfs_alloc_log_block( STATIC void xfs_alloc_log_keys( xfs_btree_cur_t *cur, /* btree cursor */ - xfs_buf_t *bp, /* buffer containing btree block */ - int kfirst, /* index of first key to log */ + xfs_buf_t *bp, /* buffer containing btree block */ + int kfirst, /* index of first key to log */ int klast) /* index of last key to log */ { - xfs_alloc_block_t *block; /* btree block to log from */ + xfs_alloc_block_t *block; /* btree block to log from */ int first; /* first byte offset logged */ xfs_alloc_key_t *kp; /* key pointer in btree block */ int last; /* last byte offset logged */ @@ -846,11 +846,11 @@ xfs_alloc_log_keys( STATIC void xfs_alloc_log_ptrs( xfs_btree_cur_t *cur, /* btree cursor */ - xfs_buf_t *bp, /* buffer containing btree block */ - int pfirst, /* index of first pointer to log */ + xfs_buf_t *bp, /* buffer containing btree block */ + int pfirst, /* index of first pointer to log */ int plast) /* index of last pointer to log */ { - xfs_alloc_block_t *block; /* btree block to log from */ + xfs_alloc_block_t *block; /* btree block to log from */ int first; /* first byte offset logged */ int last; /* last byte offset logged */ xfs_alloc_ptr_t *pp; /* block-pointer pointer in btree blk */ @@ -869,10 +869,10 @@ STATIC void xfs_alloc_log_recs( xfs_btree_cur_t *cur, /* btree cursor */ xfs_buf_t *bp, /* buffer containing btree block */ - int rfirst, /* index of first record to log */ + int rfirst, /* index of first record to log */ int rlast) /* index of last record to log */ { - xfs_alloc_block_t *block; /* btree block to log from */ + xfs_alloc_block_t *block; /* btree block to log from */ int first; /* first byte offset logged */ int last; /* last byte offset logged */ xfs_alloc_rec_t *rp; /* record pointer for btree block */ @@ -883,7 +883,7 @@ xfs_alloc_log_recs( #ifdef DEBUG { xfs_agf_t *agf; - xfs_alloc_rec_t *p; + xfs_alloc_rec_t *p; agf = XFS_BUF_TO_AGF(cur->bc_private.a.agbp); for (p = &rp[rfirst - 1]; p <= &rp[rlast - 1]; p++) @@ -978,8 +978,8 @@ xfs_alloc_lookup( */ else { int high; /* high entry number */ - xfs_alloc_key_t *kkbase=NULL;/* base of keys in block */ - xfs_alloc_rec_t *krbase=NULL;/* base of records in block */ + xfs_alloc_key_t *kkbase=NULL;/* base of keys in block */ + xfs_alloc_rec_t *krbase=NULL;/* base of records in block */ int low; /* low entry number */ /* @@ -1019,13 +1019,13 @@ xfs_alloc_lookup( * Get startblock & blockcount. */ if (level > 0) { - xfs_alloc_key_t *kkp; + xfs_alloc_key_t *kkp; kkp = kkbase + keyno - 1; startblock = INT_GET(kkp->ar_startblock, ARCH_CONVERT); blockcount = INT_GET(kkp->ar_blockcount, ARCH_CONVERT); } else { - xfs_alloc_rec_t *krp; + xfs_alloc_rec_t *krp; krp = krbase + keyno - 1; startblock = INT_GET(krp->ar_startblock, ARCH_CONVERT); @@ -1132,7 +1132,7 @@ xfs_alloc_lshift( xfs_alloc_block_t *left; /* left neighbor btree block */ int nrec; /* new number of left block entries */ xfs_buf_t *rbp; /* buffer for right (current) block */ - xfs_alloc_block_t *right; /* right (current) btree block */ + xfs_alloc_block_t *right; /* right (current) btree block */ xfs_alloc_key_t *rkp=NULL; /* key pointer for right block */ xfs_alloc_ptr_t *rpp=NULL; /* address pointer for right block */ xfs_alloc_rec_t *rrp=NULL; /* record pointer for right block */ @@ -1183,8 +1183,8 @@ xfs_alloc_lshift( * If non-leaf, copy a key and a ptr to the left block. */ if (level > 0) { - xfs_alloc_key_t *lkp; /* key pointer for left block */ - xfs_alloc_ptr_t *lpp; /* address pointer for left block */ + xfs_alloc_key_t *lkp; /* key pointer for left block */ + xfs_alloc_ptr_t *lpp; /* address pointer for left block */ lkp = XFS_ALLOC_KEY_ADDR(left, nrec, cur); rkp = XFS_ALLOC_KEY_ADDR(right, 1, cur); @@ -1204,7 +1204,7 @@ xfs_alloc_lshift( * If leaf, copy a record to the left block. */ else { - xfs_alloc_rec_t *lrp; /* record pointer for left block */ + xfs_alloc_rec_t *lrp; /* record pointer for left block */ lrp = XFS_ALLOC_REC_ADDR(left, nrec, cur); rrp = XFS_ALLOC_REC_ADDR(right, 1, cur); @@ -1273,7 +1273,7 @@ xfs_alloc_newroot( int nptr; /* new value for key index, 1 or 2 */ xfs_agblock_t rbno; /* right block number */ xfs_buf_t *rbp; /* right btree buffer */ - xfs_alloc_block_t *right; /* right btree block */ + xfs_alloc_block_t *right; /* right btree block */ mp = cur->bc_mp; @@ -1376,7 +1376,7 @@ xfs_alloc_newroot( kp[0] = *XFS_ALLOC_KEY_ADDR(left, 1, cur); /* INT_: structure copy */ kp[1] = *XFS_ALLOC_KEY_ADDR(right, 1, cur);/* INT_: structure copy */ } else { - xfs_alloc_rec_t *rp; /* btree record pointer */ + xfs_alloc_rec_t *rp; /* btree record pointer */ rp = XFS_ALLOC_REC_ADDR(left, 1, cur); kp[0].ar_startblock = rp->ar_startblock; /* INT_: direct copy */ @@ -1424,7 +1424,7 @@ xfs_alloc_rshift( xfs_buf_t *lbp; /* buffer for left (current) block */ xfs_alloc_block_t *left; /* left (current) btree block */ xfs_buf_t *rbp; /* buffer for right neighbor block */ - xfs_alloc_block_t *right; /* right neighbor btree block */ + xfs_alloc_block_t *right; /* right neighbor btree block */ xfs_alloc_key_t *rkp; /* key pointer for right block */ xfs_btree_cur_t *tcur; /* temporary cursor */ @@ -1474,9 +1474,9 @@ xfs_alloc_rshift( * copy the last left block entry to the hole. */ if (level > 0) { - xfs_alloc_key_t *lkp; /* key pointer for left block */ - xfs_alloc_ptr_t *lpp; /* address pointer for left block */ - xfs_alloc_ptr_t *rpp; /* address pointer for right block */ + xfs_alloc_key_t *lkp; /* key pointer for left block */ + xfs_alloc_ptr_t *lpp; /* address pointer for left block */ + xfs_alloc_ptr_t *rpp; /* address pointer for right block */ lkp = XFS_ALLOC_KEY_ADDR(left, INT_GET(left->bb_numrecs, ARCH_CONVERT), cur); lpp = XFS_ALLOC_PTR_ADDR(left, INT_GET(left->bb_numrecs, ARCH_CONVERT), cur); @@ -1500,8 +1500,8 @@ xfs_alloc_rshift( xfs_alloc_log_ptrs(cur, rbp, 1, INT_GET(right->bb_numrecs, ARCH_CONVERT) + 1); xfs_btree_check_key(cur->bc_btnum, rkp, rkp + 1); } else { - xfs_alloc_rec_t *lrp; /* record pointer for left block */ - xfs_alloc_rec_t *rrp; /* record pointer for right block */ + xfs_alloc_rec_t *lrp; /* record pointer for left block */ + xfs_alloc_rec_t *rrp; /* record pointer for right block */ lrp = XFS_ALLOC_REC_ADDR(left, INT_GET(left->bb_numrecs, ARCH_CONVERT), cur); rrp = XFS_ALLOC_REC_ADDR(right, 1, cur); @@ -1549,7 +1549,7 @@ xfs_alloc_split( int level, /* level to split */ xfs_agblock_t *bnop, /* output: block number allocated */ xfs_alloc_key_t *keyp, /* output: first key of new block */ - xfs_btree_cur_t **curp, /* output: new cursor */ + xfs_btree_cur_t **curp, /* output: new cursor */ int *stat) /* success/failure */ { int error; /* error return value */ @@ -1559,7 +1559,7 @@ xfs_alloc_split( xfs_alloc_block_t *left; /* left (current) btree block */ xfs_agblock_t rbno; /* right (new) block number */ xfs_buf_t *rbp; /* buffer for right block */ - xfs_alloc_block_t *right; /* right (new) btree block */ + xfs_alloc_block_t *right; /* right (new) btree block */ /* * Allocate the new block from the freelist. @@ -1606,10 +1606,10 @@ xfs_alloc_split( * For non-leaf blocks, copy keys and addresses over to the new block. */ if (level > 0) { - xfs_alloc_key_t *lkp; /* left btree key pointer */ - xfs_alloc_ptr_t *lpp; /* left btree address pointer */ - xfs_alloc_key_t *rkp; /* right btree key pointer */ - xfs_alloc_ptr_t *rpp; /* right btree address pointer */ + xfs_alloc_key_t *lkp; /* left btree key pointer */ + xfs_alloc_ptr_t *lpp; /* left btree address pointer */ + xfs_alloc_key_t *rkp; /* right btree key pointer */ + xfs_alloc_ptr_t *rpp; /* right btree address pointer */ lkp = XFS_ALLOC_KEY_ADDR(left, i, cur); lpp = XFS_ALLOC_PTR_ADDR(left, i, cur); @@ -1631,8 +1631,8 @@ xfs_alloc_split( * For leaf blocks, copy records over to the new block. */ else { - xfs_alloc_rec_t *lrp; /* left btree record pointer */ - xfs_alloc_rec_t *rrp; /* right btree record pointer */ + xfs_alloc_rec_t *lrp; /* left btree record pointer */ + xfs_alloc_rec_t *rrp; /* right btree record pointer */ lrp = XFS_ALLOC_REC_ADDR(left, i, cur); rrp = XFS_ALLOC_REC_ADDR(right, 1, cur); @@ -1711,7 +1711,7 @@ xfs_alloc_updkey( * at the first entry in the block. */ for (ptr = 1; ptr == 1 && level < cur->bc_nlevels; level++) { - xfs_alloc_block_t *block; /* btree block */ + xfs_alloc_block_t *block; /* btree block */ xfs_buf_t *bp; /* buffer for block */ #ifdef DEBUG int error; /* error return value */ @@ -1746,7 +1746,7 @@ xfs_alloc_decrement( int level, /* level in btree, 0 is leaf */ int *stat) /* success/failure */ { - xfs_alloc_block_t *block; /* btree block */ + xfs_alloc_block_t *block; /* btree block */ int error; /* error return value */ int lev; /* btree level */ @@ -1827,7 +1827,7 @@ xfs_alloc_decrement( */ int /* error */ xfs_alloc_delete( - xfs_btree_cur_t *cur, /* btree cursor */ + xfs_btree_cur_t *cur, /* btree cursor */ int *stat) /* success/failure */ { int error; /* error return value */ @@ -1866,7 +1866,7 @@ xfs_alloc_get_rec( xfs_extlen_t *len, /* output: length of extent */ int *stat) /* output: success/failure */ { - xfs_alloc_block_t *block; /* btree block */ + xfs_alloc_block_t *block; /* btree block */ #ifdef DEBUG int error; /* error return value */ #endif @@ -1909,7 +1909,7 @@ xfs_alloc_increment( int level, /* level in btree, 0 is leaf */ int *stat) /* success/failure */ { - xfs_alloc_block_t *block; /* btree block */ + xfs_alloc_block_t *block; /* btree block */ xfs_buf_t *bp; /* tree block buffer */ int error; /* error return value */ int lev; /* btree level */ @@ -1996,16 +1996,16 @@ xfs_alloc_increment( */ int /* error */ xfs_alloc_insert( - xfs_btree_cur_t *cur, /* btree cursor */ + xfs_btree_cur_t *cur, /* btree cursor */ int *stat) /* success/failure */ { int error; /* error return value */ int i; /* result value, 0 for failure */ int level; /* current level number in btree */ xfs_agblock_t nbno; /* new block number (split result) */ - xfs_btree_cur_t *ncur; /* new cursor (split result) */ - xfs_alloc_rec_t nrec; /* record being inserted this level */ - xfs_btree_cur_t *pcur; /* previous level's cursor */ + xfs_btree_cur_t *ncur; /* new cursor (split result) */ + xfs_alloc_rec_t nrec; /* record being inserted this level */ + xfs_btree_cur_t *pcur; /* previous level's cursor */ level = 0; nbno = NULLAGBLOCK; @@ -2055,7 +2055,7 @@ xfs_alloc_insert( */ int /* error */ xfs_alloc_lookup_eq( - xfs_btree_cur_t *cur, /* btree cursor */ + xfs_btree_cur_t *cur, /* btree cursor */ xfs_agblock_t bno, /* starting block of extent */ xfs_extlen_t len, /* length of extent */ int *stat) /* success/failure */ @@ -2071,7 +2071,7 @@ xfs_alloc_lookup_eq( */ int /* error */ xfs_alloc_lookup_ge( - xfs_btree_cur_t *cur, /* btree cursor */ + xfs_btree_cur_t *cur, /* btree cursor */ xfs_agblock_t bno, /* starting block of extent */ xfs_extlen_t len, /* length of extent */ int *stat) /* success/failure */ @@ -2087,7 +2087,7 @@ xfs_alloc_lookup_ge( */ int /* error */ xfs_alloc_lookup_le( - xfs_btree_cur_t *cur, /* btree cursor */ + xfs_btree_cur_t *cur, /* btree cursor */ xfs_agblock_t bno, /* starting block of extent */ xfs_extlen_t len, /* length of extent */ int *stat) /* success/failure */ @@ -2107,7 +2107,7 @@ xfs_alloc_update( xfs_agblock_t bno, /* starting block of extent */ xfs_extlen_t len) /* length of extent */ { - xfs_alloc_block_t *block; /* btree block to update */ + xfs_alloc_block_t *block; /* btree block to update */ int error; /* error return value */ int ptr; /* current record number (updating) */ @@ -2157,7 +2157,7 @@ xfs_alloc_update( * Updating first record in leaf. Pass new key value up to our parent. */ if (ptr == 1) { - xfs_alloc_key_t key; /* key containing [bno, len] */ + xfs_alloc_key_t key; /* key containing [bno, len] */ INT_SET(key.ar_startblock, ARCH_CONVERT, bno); INT_SET(key.ar_blockcount, ARCH_CONVERT, len); diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c index a912793ae..7c4ddeead 100644 --- a/libxfs/xfs_attr_leaf.c +++ b/libxfs/xfs_attr_leaf.c @@ -199,7 +199,7 @@ xfs_attr_leaf_add(xfs_dabuf_t *bp, xfs_da_args_t *args) /* * After compaction, the block is guaranteed to have only one - * free region, in freemap[0]. If it is not big enough, give up. + * free region, in freemap[0]. If it is not big enough, give up. */ if (INT_GET(hdr->freemap[0].size, ARCH_CONVERT) < (entsize + sizeof(xfs_attr_leaf_entry_t))) @@ -402,7 +402,7 @@ xfs_attr_leaf_compact(xfs_trans_t *trans, xfs_dabuf_t *bp) * * This code adjusts the args->index/blkno and args->index2/blkno2 fields * to match what it is doing in splitting the attribute leaf block. Those - * values are used in "atomic rename" operations on attributes. Note that + * values are used in "atomic rename" operations on attributes. Note that * the "new" and "old" values can end up in different blocks. */ STATIC void @@ -619,7 +619,7 @@ xfs_attr_leaf_figure_balance(xfs_da_state_t *state, entry = &leaf1->entries[0]; for (count = index = 0; count < max; entry++, index++, count++) { -#define XFS_ATTR_ABS(A) (((A) < 0) ? -(A) : (A)) +#define XFS_ATTR_ABS(A) (((A) < 0) ? -(A) : (A)) /* * The new entry is in the first block, account for it. */ @@ -870,7 +870,7 @@ xfs_attr_leaf_unbalance(xfs_da_state_t *state, xfs_da_state_blk_t *drop_blk, memset(tmpbuffer, 0, state->blocksize); tmp_leaf = (xfs_attr_leafblock_t *)tmpbuffer; tmp_hdr = &tmp_leaf->hdr; - tmp_hdr->info = save_hdr->info; /* struct copy */ + tmp_hdr->info = save_hdr->info; /* struct copy */ INT_ZERO(tmp_hdr->count, ARCH_CONVERT); INT_SET(tmp_hdr->firstused, ARCH_CONVERT, state->blocksize); if (INT_ISZERO(tmp_hdr->firstused, ARCH_CONVERT)) { @@ -985,7 +985,7 @@ xfs_attr_leaf_moveents(xfs_attr_leafblock_t *leaf_s, int start_s, #ifdef GROT /* * Code to drop INCOMPLETE entries. Difficult to use as we - * may also need to change the insertion index. Code turned + * may also need to change the insertion index. Code turned * off for 6.2, should be revisited later. */ if (entry_s->flags & XFS_ATTR_INCOMPLETE) { /* skip partials? */ diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c index ade4680a6..0af74acc5 100644 --- a/libxfs/xfs_bmap.c +++ b/libxfs/xfs_bmap.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -42,10 +42,10 @@ STATIC int /* error */ xfs_bmap_add_extent( xfs_inode_t *ip, /* incore inode pointer */ xfs_extnum_t idx, /* extent number to update/insert */ - xfs_btree_cur_t **curp, /* if *curp is null, not a btree */ + xfs_btree_cur_t **curp, /* if *curp is null, not a btree */ xfs_bmbt_irec_t *new, /* new data to put in extent list */ - xfs_fsblock_t *first, /* pointer to firstblock variable */ - xfs_bmap_free_t *flist, /* list of extents to be freed */ + xfs_fsblock_t *first, /* pointer to firstblock variable */ + xfs_bmap_free_t *flist, /* list of extents to be freed */ int *logflagsp, /* inode logging flags */ int whichfork, /* data or attr fork */ int rsvd) /* OK to use reserved data blocks */ @@ -107,7 +107,7 @@ xfs_bmap_add_extent( &logflags, whichfork))) goto done; } else { - xfs_bmbt_irec_t prev; /* old extent at offset idx */ + xfs_bmbt_irec_t prev; /* old extent at offset idx */ /* * Get the record referred to by idx. @@ -211,11 +211,11 @@ STATIC int /* error */ xfs_bmap_add_extent_delay_real( xfs_inode_t *ip, /* incore inode pointer */ xfs_extnum_t idx, /* extent number to update/insert */ - xfs_btree_cur_t **curp, /* if *curp is null, not a btree */ + xfs_btree_cur_t **curp, /* if *curp is null, not a btree */ xfs_bmbt_irec_t *new, /* new data to put in extent list */ xfs_filblks_t *dnew, /* new delayed-alloc indirect blocks */ - xfs_fsblock_t *first, /* pointer to firstblock variable */ - xfs_bmap_free_t *flist, /* list of extents to be freed */ + xfs_fsblock_t *first, /* pointer to firstblock variable */ + xfs_bmap_free_t *flist, /* list of extents to be freed */ int *logflagsp, /* inode logging flags */ int rsvd) /* OK to use reserved data block allocation */ { @@ -231,7 +231,7 @@ xfs_bmap_add_extent_delay_real( xfs_fileoff_t new_endoff; /* end offset of new entry */ xfs_bmbt_irec_t r[3]; /* neighbor extent entries */ /* left is 0, right is 1, prev is 2 */ - int rval=0; /* return value (logging flags) */ + int rval=0; /* return value (logging flags) */ int state = 0;/* state bits, accessed thru macros */ xfs_filblks_t temp; /* value for dnew calculations */ xfs_filblks_t temp2; /* value for dnew calculations */ @@ -243,18 +243,18 @@ xfs_bmap_add_extent_delay_real( LEFT_VALID, RIGHT_VALID }; -#define LEFT r[0] -#define RIGHT r[1] -#define PREV r[2] -#define MASK(b) (1 << (b)) -#define MASK2(a,b) (MASK(a) | MASK(b)) -#define MASK3(a,b,c) (MASK2(a,b) | MASK(c)) -#define MASK4(a,b,c,d) (MASK3(a,b,c) | MASK(d)) -#define STATE_SET(b,v) ((v) ? (state |= MASK(b)) : (state &= ~MASK(b))) -#define STATE_TEST(b) (state & MASK(b)) -#define STATE_SET_TEST(b,v) ((v) ? ((state |= MASK(b)), 1) : \ +#define LEFT r[0] +#define RIGHT r[1] +#define PREV r[2] +#define MASK(b) (1 << (b)) +#define MASK2(a,b) (MASK(a) | MASK(b)) +#define MASK3(a,b,c) (MASK2(a,b) | MASK(c)) +#define MASK4(a,b,c,d) (MASK3(a,b,c) | MASK(d)) +#define STATE_SET(b,v) ((v) ? (state |= MASK(b)) : (state &= ~MASK(b))) +#define STATE_TEST(b) (state & MASK(b)) +#define STATE_SET_TEST(b,v) ((v) ? ((state |= MASK(b)), 1) : \ ((state &= ~MASK(b)), 0)) -#define SWITCH_STATE \ +#define SWITCH_STATE \ (state & MASK4(LEFT_FILLING, RIGHT_FILLING, LEFT_CONTIG, RIGHT_CONTIG)) /* @@ -751,7 +751,7 @@ STATIC int /* error */ xfs_bmap_add_extent_unwritten_real( xfs_inode_t *ip, /* incore inode pointer */ xfs_extnum_t idx, /* extent number to update/insert */ - xfs_btree_cur_t **curp, /* if *curp is null, not a btree */ + xfs_btree_cur_t **curp, /* if *curp is null, not a btree */ xfs_bmbt_irec_t *new, /* new data to put in extent list */ int *logflagsp) /* inode logging flags */ { @@ -764,11 +764,11 @@ xfs_bmap_add_extent_unwritten_real( #endif int i; /* temp state */ xfs_fileoff_t new_endoff; /* end offset of new entry */ - xfs_exntst_t newext; /* new extent state */ - xfs_exntst_t oldext; /* old extent state */ + xfs_exntst_t newext; /* new extent state */ + xfs_exntst_t oldext; /* old extent state */ xfs_bmbt_irec_t r[3]; /* neighbor extent entries */ /* left is 0, right is 1, prev is 2 */ - int rval=0; /* return value (logging flags) */ + int rval=0; /* return value (logging flags) */ int state = 0;/* state bits, accessed thru macros */ enum { /* bit number definitions for state */ LEFT_CONTIG, RIGHT_CONTIG, @@ -777,18 +777,18 @@ xfs_bmap_add_extent_unwritten_real( LEFT_VALID, RIGHT_VALID }; -#define LEFT r[0] -#define RIGHT r[1] -#define PREV r[2] -#define MASK(b) (1 << (b)) -#define MASK2(a,b) (MASK(a) | MASK(b)) -#define MASK3(a,b,c) (MASK2(a,b) | MASK(c)) -#define MASK4(a,b,c,d) (MASK3(a,b,c) | MASK(d)) -#define STATE_SET(b,v) ((v) ? (state |= MASK(b)) : (state &= ~MASK(b))) -#define STATE_TEST(b) (state & MASK(b)) -#define STATE_SET_TEST(b,v) ((v) ? ((state |= MASK(b)), 1) : \ +#define LEFT r[0] +#define RIGHT r[1] +#define PREV r[2] +#define MASK(b) (1 << (b)) +#define MASK2(a,b) (MASK(a) | MASK(b)) +#define MASK3(a,b,c) (MASK2(a,b) | MASK(c)) +#define MASK4(a,b,c,d) (MASK3(a,b,c) | MASK(d)) +#define STATE_SET(b,v) ((v) ? (state |= MASK(b)) : (state &= ~MASK(b))) +#define STATE_TEST(b) (state & MASK(b)) +#define STATE_SET_TEST(b,v) ((v) ? ((state |= MASK(b)), 1) : \ ((state &= ~MASK(b)), 0)) -#define SWITCH_STATE \ +#define SWITCH_STATE \ (state & MASK4(LEFT_FILLING, RIGHT_FILLING, LEFT_CONTIG, RIGHT_CONTIG)) /* @@ -1281,7 +1281,7 @@ xfs_bmap_add_extent_hole_delay( xfs_filblks_t newlen=0; /* new indirect size */ xfs_filblks_t oldlen=0; /* old indirect size */ xfs_bmbt_irec_t right; /* right neighbor extent entry */ - int state; /* state bits, accessed thru macros */ + int state; /* state bits, accessed thru macros */ xfs_filblks_t temp; /* temp for indirect calculations */ enum { /* bit number definitions for state */ LEFT_CONTIG, RIGHT_CONTIG, @@ -1289,13 +1289,13 @@ xfs_bmap_add_extent_hole_delay( LEFT_VALID, RIGHT_VALID }; -#define MASK(b) (1 << (b)) -#define MASK2(a,b) (MASK(a) | MASK(b)) -#define STATE_SET(b,v) ((v) ? (state |= MASK(b)) : (state &= ~MASK(b))) -#define STATE_TEST(b) (state & MASK(b)) -#define STATE_SET_TEST(b,v) ((v) ? ((state |= MASK(b)), 1) : \ +#define MASK(b) (1 << (b)) +#define MASK2(a,b) (MASK(a) | MASK(b)) +#define STATE_SET(b,v) ((v) ? (state |= MASK(b)) : (state &= ~MASK(b))) +#define STATE_TEST(b) (state & MASK(b)) +#define STATE_SET_TEST(b,v) ((v) ? ((state |= MASK(b)), 1) : \ ((state &= ~MASK(b)), 0)) -#define SWITCH_STATE (state & MASK2(LEFT_CONTIG, RIGHT_CONTIG)) +#define SWITCH_STATE (state & MASK2(LEFT_CONTIG, RIGHT_CONTIG)) base = ip->i_df.if_u1.if_extents; ep = &base[idx]; @@ -1458,13 +1458,13 @@ xfs_bmap_add_extent_hole_real( LEFT_VALID, RIGHT_VALID }; -#define MASK(b) (1 << (b)) -#define MASK2(a,b) (MASK(a) | MASK(b)) -#define STATE_SET(b,v) ((v) ? (state |= MASK(b)) : (state &= ~MASK(b))) -#define STATE_TEST(b) (state & MASK(b)) -#define STATE_SET_TEST(b,v) ((v) ? ((state |= MASK(b)), 1) : \ +#define MASK(b) (1 << (b)) +#define MASK2(a,b) (MASK(a) | MASK(b)) +#define STATE_SET(b,v) ((v) ? (state |= MASK(b)) : (state &= ~MASK(b))) +#define STATE_TEST(b) (state & MASK(b)) +#define STATE_SET_TEST(b,v) ((v) ? ((state |= MASK(b)), 1) : \ ((state &= ~MASK(b)), 0)) -#define SWITCH_STATE (state & MASK2(LEFT_CONTIG, RIGHT_CONTIG)) +#define SWITCH_STATE (state & MASK2(LEFT_CONTIG, RIGHT_CONTIG)) ifp = XFS_IFORK_PTR(ip, whichfork); ASSERT(idx <= ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t)); @@ -1655,7 +1655,7 @@ xfs_bmap_alloc( xfs_bmalloca_t *ap) /* bmap alloc argument struct */ { xfs_fsblock_t adjust; /* adjustment to block numbers */ - xfs_alloctype_t atype=0; /* type for allocation routines */ + xfs_alloctype_t atype=0; /* type for allocation routines */ int error; /* error return value */ xfs_agnumber_t fb_agno; /* ag number of ap->firstblock */ xfs_mount_t *mp; /* mount point structure */ @@ -1666,7 +1666,7 @@ xfs_bmap_alloc( xfs_extlen_t ralen=0; /* realtime allocation length */ #endif -#define ISLEGAL(x,y) \ +#define ISLEGAL(x,y) \ (rt ? \ (x) < mp->m_sb.sb_rblocks : \ XFS_FSB_TO_AGNO(mp, x) == XFS_FSB_TO_AGNO(mp, y) && \ @@ -1703,7 +1703,7 @@ xfs_bmap_alloc( orig_end = orig_off + orig_alen; /* * If the file offset is unaligned vs. the extent size - * we need to align it. This will be possible unless + * we need to align it. This will be possible unless * the file was previously written with a kernel that didn't * perform this alignment. */ @@ -2013,7 +2013,7 @@ xfs_bmap_alloc( */ else { xfs_agnumber_t ag; - xfs_alloc_arg_t args; + xfs_alloc_arg_t args; xfs_extlen_t blen; xfs_extlen_t delta; int isaligned; @@ -2301,16 +2301,16 @@ xfs_bmap_del_extent( xfs_inode_t *ip, /* incore inode pointer */ xfs_trans_t *tp, /* current transaction pointer */ xfs_extnum_t idx, /* extent number to update/delete */ - xfs_bmap_free_t *flist, /* list of extents to be freed */ + xfs_bmap_free_t *flist, /* list of extents to be freed */ xfs_btree_cur_t *cur, /* if null, not a btree */ xfs_bmbt_irec_t *del, /* data to remove from extent list */ int *logflagsp, /* inode logging flags */ int whichfork, /* data or attr fork */ int rsvd) /* OK to allocate reserved blocks */ { - xfs_filblks_t da_new; /* new delay-alloc indirect blocks */ - xfs_filblks_t da_old; /* old delay-alloc indirect blocks */ - xfs_fsblock_t del_endblock=0; /* first block past del */ + xfs_filblks_t da_new; /* new delay-alloc indirect blocks */ + xfs_filblks_t da_old; /* old delay-alloc indirect blocks */ + xfs_fsblock_t del_endblock=0; /* first block past del */ xfs_fileoff_t del_endoff; /* first offset past del */ int delay; /* current block is delayed allocated */ int do_fx; /* free extent at end of routine */ @@ -2329,7 +2329,7 @@ xfs_bmap_del_extent( xfs_bmbt_irec_t new; /* new record to be inserted */ /* REFERENCED */ xfs_extnum_t nextents; /* number of extents in list */ - uint qfield; /* quota field to update */ + uint qfield; /* quota field to update */ xfs_filblks_t temp; /* for indirect length calculations */ xfs_filblks_t temp2; /* for indirect length calculations */ @@ -2356,7 +2356,7 @@ xfs_bmap_del_extent( if (!delay) { flags = XFS_ILOG_CORE; /* - * Realtime allocation. Free it and record di_nblocks update. + * Realtime allocation. Free it and record di_nblocks update. */ if (whichfork == XFS_DATA_FORK && (ip->i_d.di_flags & XFS_DIFLAG_REALTIME)) { @@ -2625,7 +2625,7 @@ done: */ STATIC void xfs_bmap_del_free( - xfs_bmap_free_t *flist, /* free item list header */ + xfs_bmap_free_t *flist, /* free item list header */ xfs_bmap_free_item_t *prev, /* previous item on list, if any */ xfs_bmap_free_item_t *free) /* list item to be freed */ { @@ -2806,7 +2806,7 @@ xfs_bmap_insert_exlist( xfs_inode_t *ip, /* incore inode pointer */ xfs_extnum_t idx, /* starting index of new items */ xfs_extnum_t count, /* number of inserted items */ - xfs_bmbt_irec_t *new, /* items to insert */ + xfs_bmbt_irec_t *new, /* items to insert */ int whichfork) /* data or attr fork */ { xfs_bmbt_rec_t *base; /* extent list base */ @@ -2858,7 +2858,7 @@ xfs_bmap_local_to_extents( flags = 0; error = 0; if (ifp->if_bytes) { - xfs_alloc_arg_t args; /* allocation arguments */ + xfs_alloc_arg_t args; /* allocation arguments */ xfs_buf_t *bp; /* buffer for extent list block */ xfs_bmbt_rec_t *ep; /* extent list pointer */ @@ -2921,11 +2921,11 @@ xfs_bmap_do_search_extents( xfs_fileoff_t bno, /* block number searched for */ int *eofp, /* out: end of file found */ xfs_extnum_t *lastxp, /* out: last extent index */ - xfs_bmbt_irec_t *gotp, /* out: extent entry found */ - xfs_bmbt_irec_t *prevp) /* out: previous extent entry found */ + xfs_bmbt_irec_t *gotp, /* out: extent entry found */ + xfs_bmbt_irec_t *prevp) /* out: previous extent entry found */ { xfs_bmbt_rec_t *ep; /* extent list entry pointer */ - xfs_bmbt_irec_t got; /* extent list entry, decoded */ + xfs_bmbt_irec_t got; /* extent list entry, decoded */ int high; /* high index of binary search */ int low; /* low index of binary search */ @@ -3013,20 +3013,20 @@ xfs_bmap_do_search_extents( * Else, *lastxp will be set to the index of the found * entry; *gotp will contain the entry. */ -STATIC xfs_bmbt_rec_t * /* pointer to found extent entry */ +STATIC xfs_bmbt_rec_t * /* pointer to found extent entry */ xfs_bmap_search_extents( - xfs_inode_t *ip, /* incore inode pointer */ - xfs_fileoff_t bno, /* block number searched for */ - int whichfork, /* data or attr fork */ - int *eofp, /* out: end of file found */ - xfs_extnum_t *lastxp, /* out: last extent index */ - xfs_bmbt_irec_t *gotp, /* out: extent entry found */ - xfs_bmbt_irec_t *prevp) /* out: previous extent entry found */ + xfs_inode_t *ip, /* incore inode pointer */ + xfs_fileoff_t bno, /* block number searched for */ + int whichfork, /* data or attr fork */ + int *eofp, /* out: end of file found */ + xfs_extnum_t *lastxp, /* out: last extent index */ + xfs_bmbt_irec_t *gotp, /* out: extent entry found */ + xfs_bmbt_irec_t *prevp) /* out: previous extent entry found */ { xfs_ifork_t *ifp; /* inode fork pointer */ - xfs_bmbt_rec_t *base; /* base of extent list */ - xfs_extnum_t lastx; /* last extent index used */ - xfs_extnum_t nextents; /* extent list size */ + xfs_bmbt_rec_t *base; /* base of extent list */ + xfs_extnum_t lastx; /* last extent index used */ + xfs_extnum_t nextents; /* extent list size */ XFS_STATS_INC(xfsstats.xs_look_exlist); ifp = XFS_IFORK_PTR(ip, whichfork); @@ -3119,7 +3119,7 @@ xfs_bmap_add_free( /* * Compute and fill in the value of the maximum depth of a bmap btree - * in this filesystem. Done once, during mount. + * in this filesystem. Done once, during mount. */ void xfs_bmap_compute_maxlevels( @@ -3231,10 +3231,10 @@ xfs_bmap_last_before( int eof; /* hit end of file */ xfs_bmbt_rec_t *ep; /* pointer to last extent */ int error; /* error return value */ - xfs_bmbt_irec_t got; /* current extent value */ + xfs_bmbt_irec_t got; /* current extent value */ xfs_ifork_t *ifp; /* inode fork pointer */ xfs_extnum_t lastx; /* last extent used */ - xfs_bmbt_irec_t prev; /* previous extent value */ + xfs_bmbt_irec_t prev; /* previous extent value */ if (XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE && XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS && @@ -3318,7 +3318,7 @@ xfs_bmap_one_block( xfs_bmbt_rec_t *ep; /* ptr to fork's extent */ xfs_ifork_t *ifp; /* inode fork pointer */ int rval; /* return value */ - xfs_bmbt_irec_t s; /* internal version of extent */ + xfs_bmbt_irec_t s; /* internal version of extent */ #ifndef DEBUG if (whichfork == XFS_DATA_FORK) @@ -3350,7 +3350,7 @@ xfs_bmap_read_extents( xfs_inode_t *ip, /* incore inode */ int whichfork) /* data or attr fork */ { - xfs_bmbt_block_t *block; /* current btree block */ + xfs_bmbt_block_t *block; /* current btree block */ xfs_fsblock_t bno; /* block # of "block" */ xfs_buf_t *bp; /* buffer for "block" */ int error; /* error return value */ @@ -3508,23 +3508,23 @@ xfs_bmapi( xfs_fsblock_t *firstblock, /* first allocated block controls a.g. for allocs */ xfs_extlen_t total, /* total blocks needed */ - xfs_bmbt_irec_t *mval, /* output: map values */ + xfs_bmbt_irec_t *mval, /* output: map values */ int *nmap, /* i/o: mval size/count */ - xfs_bmap_free_t *flist) /* i/o: list extents to free */ + xfs_bmap_free_t *flist) /* i/o: list extents to free */ { xfs_fsblock_t abno; /* allocated block number */ xfs_extlen_t alen; /* allocated extent length */ xfs_fileoff_t aoff; /* allocated file offset */ xfs_bmalloca_t bma; /* args for xfs_bmap_alloc */ char contig; /* allocation must be one extent */ - xfs_btree_cur_t *cur; /* bmap btree cursor */ + xfs_btree_cur_t *cur; /* bmap btree cursor */ char delay; /* this request is for delayed alloc */ xfs_fileoff_t end; /* end of mapped file region */ int eof; /* we've hit the end of extent list */ xfs_bmbt_rec_t *ep; /* extent list entry pointer */ int error; /* error return */ char exact; /* don't do all of wasdelayed extent */ - xfs_bmbt_irec_t got; /* current extent list record */ + xfs_bmbt_irec_t got; /* current extent list record */ xfs_ifork_t *ifp; /* inode fork pointer */ xfs_extlen_t indlen; /* indirect blocks length */ char inhole; /* current location is hole in file */ @@ -3537,7 +3537,7 @@ xfs_bmapi( int nallocs; /* number of extents alloc\'d */ xfs_extnum_t nextents; /* number of extents in file */ xfs_fileoff_t obno; /* old block number (offset) */ - xfs_bmbt_irec_t prev; /* previous extent list record */ + xfs_bmbt_irec_t prev; /* previous extent list record */ char stateless; /* ignore state flag set */ int tmp_logflags; /* temp flags holder */ char trim; /* output trimmed to match range */ @@ -3550,7 +3550,7 @@ xfs_bmapi( xfs_fileoff_t orig_bno; /* original block number value */ int orig_flags; /* original flags arg value */ xfs_filblks_t orig_len; /* original value of len arg */ - xfs_bmbt_irec_t *orig_mval; /* original value of mval */ + xfs_bmbt_irec_t *orig_mval; /* original value of mval */ int orig_nmap; /* original value of *nmap */ orig_bno = bno; @@ -4049,10 +4049,10 @@ xfs_bmapi_single( { int eof; /* we've hit the end of extent list */ int error; /* error return */ - xfs_bmbt_irec_t got; /* current extent list record */ + xfs_bmbt_irec_t got; /* current extent list record */ xfs_ifork_t *ifp; /* inode fork pointer */ xfs_extnum_t lastx; /* last useful extent number */ - xfs_bmbt_irec_t prev; /* previous extent list record */ + xfs_bmbt_irec_t prev; /* previous extent list record */ ifp = XFS_IFORK_PTR(ip, whichfork); if (unlikely( @@ -4088,7 +4088,7 @@ xfs_bmapi_single( /* * Unmap (remove) blocks from a file. * If nexts is nonzero then the number of extents to remove is limited to - * that value. If not all extents in the block range can be removed then + * that value. If not all extents in the block range can be removed then * *done is set. */ int /* error */ @@ -4455,15 +4455,15 @@ error0: int /* error */ xfs_bmap_isaeof( xfs_inode_t *ip, /* incore inode pointer */ - xfs_fileoff_t off, /* file offset in fsblocks */ - int whichfork, /* data or attribute fork */ + xfs_fileoff_t off, /* file offset in fsblocks */ + int whichfork, /* data or attribute fork */ char *aeof) /* return value */ { int error; /* error return value */ xfs_ifork_t *ifp; /* inode fork pointer */ xfs_bmbt_rec_t *lastrec; /* extent list entry pointer */ xfs_extnum_t nextents; /* size of extent list */ - xfs_bmbt_irec_t s; /* expanded extent list entry */ + xfs_bmbt_irec_t s; /* expanded extent list entry */ ASSERT(whichfork == XFS_DATA_FORK); ifp = XFS_IFORK_PTR(ip, whichfork); diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c index dc38267d0..f855536ad 100644 --- a/libxfs/xfs_bmap_btree.c +++ b/libxfs/xfs_bmap_btree.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -696,7 +696,7 @@ xfs_bmbt_killroot( */ STATIC void xfs_bmbt_log_keys( - xfs_btree_cur_t *cur, + xfs_btree_cur_t *cur, xfs_buf_t *bp, int kfirst, int klast) @@ -735,7 +735,7 @@ xfs_bmbt_log_keys( */ STATIC void xfs_bmbt_log_ptrs( - xfs_btree_cur_t *cur, + xfs_btree_cur_t *cur, xfs_buf_t *bp, int pfirst, int plast) @@ -1357,6 +1357,7 @@ xfs_bmbt_split( return 0; } + /* * Update keys for the record. */ @@ -1511,7 +1512,7 @@ xfs_bmbt_decrement( */ int /* error */ xfs_bmbt_delete( - xfs_btree_cur_t *cur, + xfs_btree_cur_t *cur, int *stat) /* success/failure */ { int error; /* error return value */ @@ -1550,6 +1551,7 @@ xfs_bmbt_delete( * This code must be in sync with the routines xfs_bmbt_get_startoff, * xfs_bmbt_get_startblock, xfs_bmbt_get_blockcount and xfs_bmbt_get_state. */ + STATIC __inline__ void __xfs_bmbt_get_all( __uint64_t l0, @@ -1740,7 +1742,7 @@ xfs_bmbt_disk_get_startoff( xfs_exntst_t xfs_bmbt_disk_get_state( - xfs_bmbt_rec_t *r) + xfs_bmbt_rec_t *r) { int ext_flag; @@ -1750,6 +1752,7 @@ xfs_bmbt_disk_get_state( } #endif + /* * Increment cursor by one record at the level. * For nonzero levels the leaf-ward information is untouched. @@ -1839,7 +1842,7 @@ xfs_bmbt_increment( */ int /* error */ xfs_bmbt_insert( - xfs_btree_cur_t *cur, + xfs_btree_cur_t *cur, int *stat) /* success/failure */ { int error; /* error return value */ @@ -1849,9 +1852,9 @@ xfs_bmbt_insert( int i; int level; xfs_fsblock_t nbno; - xfs_btree_cur_t *ncur; + xfs_btree_cur_t *ncur; xfs_bmbt_rec_t nrec; - xfs_btree_cur_t *pcur; + xfs_btree_cur_t *pcur; XFS_BMBT_TRACE_CURSOR(cur, ENTRY); level = 0; @@ -1965,7 +1968,7 @@ xfs_bmbt_log_recs( int /* error */ xfs_bmbt_lookup_eq( - xfs_btree_cur_t *cur, + xfs_btree_cur_t *cur, xfs_fileoff_t off, xfs_fsblock_t bno, xfs_filblks_t len, @@ -1979,7 +1982,7 @@ xfs_bmbt_lookup_eq( int /* error */ xfs_bmbt_lookup_ge( - xfs_btree_cur_t *cur, + xfs_btree_cur_t *cur, xfs_fileoff_t off, xfs_fsblock_t bno, xfs_filblks_t len, @@ -1993,7 +1996,7 @@ xfs_bmbt_lookup_ge( int /* error */ xfs_bmbt_lookup_le( - xfs_btree_cur_t *cur, + xfs_btree_cur_t *cur, xfs_fileoff_t off, xfs_fsblock_t bno, xfs_filblks_t len, @@ -2125,7 +2128,7 @@ xfs_bmbt_newroot( void xfs_bmbt_set_all( xfs_bmbt_rec_t *r, - xfs_bmbt_irec_t *s) + xfs_bmbt_irec_t *s) { int extent_flag; @@ -2460,6 +2463,7 @@ xfs_bmbt_update( * Return an error condition (1) if any flags found, * otherwise return 0. */ + int xfs_check_nostate_extents( xfs_bmbt_rec_t *ep, diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c index fb3aaafc7..b0c277dbe 100644 --- a/libxfs/xfs_btree.c +++ b/libxfs/xfs_btree.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -71,7 +71,7 @@ xfs_btree_maxrecs( STATIC int /* number of records fitting in block */ xfs_btree_maxrecs( xfs_btree_cur_t *cur, /* btree cursor */ - xfs_btree_block_t *block) /* generic btree block pointer */ + xfs_btree_block_t *block) /* generic btree block pointer */ { switch (cur->bc_btnum) { case XFS_BTNUM_BNO: @@ -98,7 +98,7 @@ xfs_btree_maxrecs( void xfs_btree_check_block( xfs_btree_cur_t *cur, /* btree cursor */ - xfs_btree_block_t *block, /* generic btree block pointer */ + xfs_btree_block_t *block, /* generic btree block pointer */ int level, /* level of the btree block */ xfs_buf_t *bp) /* buffer containing block, if any */ { @@ -121,8 +121,8 @@ xfs_btree_check_key( { switch (btnum) { case XFS_BTNUM_BNO: { - xfs_alloc_key_t *k1; - xfs_alloc_key_t *k2; + xfs_alloc_key_t *k1; + xfs_alloc_key_t *k2; k1 = ak1; k2 = ak2; @@ -130,8 +130,8 @@ xfs_btree_check_key( break; } case XFS_BTNUM_CNT: { - xfs_alloc_key_t *k1; - xfs_alloc_key_t *k2; + xfs_alloc_key_t *k1; + xfs_alloc_key_t *k2; k1 = ak1; k2 = ak2; @@ -150,8 +150,8 @@ xfs_btree_check_key( break; } case XFS_BTNUM_INO: { - xfs_inobt_key_t *k1; - xfs_inobt_key_t *k2; + xfs_inobt_key_t *k1; + xfs_inobt_key_t *k2; k1 = ak1; k2 = ak2; @@ -171,7 +171,7 @@ xfs_btree_check_key( int /* error (0 or EFSCORRUPTED) */ xfs_btree_check_lblock( xfs_btree_cur_t *cur, /* btree cursor */ - xfs_btree_lblock_t *block, /* btree long form block pointer */ + xfs_btree_lblock_t *block, /* btree long form block pointer */ int level, /* level of the btree block */ xfs_buf_t *bp) /* buffer for block, if any */ { @@ -206,7 +206,7 @@ xfs_btree_check_lblock( */ int /* error (0 or EFSCORRUPTED) */ xfs_btree_check_lptr( - xfs_btree_cur_t *cur, /* btree cursor */ + xfs_btree_cur_t *cur, /* btree cursor */ xfs_dfsbno_t ptr, /* btree block disk address */ int level) /* btree block level */ { @@ -232,8 +232,8 @@ xfs_btree_check_rec( { switch (btnum) { case XFS_BTNUM_BNO: { - xfs_alloc_rec_t *r1; - xfs_alloc_rec_t *r2; + xfs_alloc_rec_t *r1; + xfs_alloc_rec_t *r2; r1 = ar1; r2 = ar2; @@ -242,8 +242,8 @@ xfs_btree_check_rec( break; } case XFS_BTNUM_CNT: { - xfs_alloc_rec_t *r1; - xfs_alloc_rec_t *r2; + xfs_alloc_rec_t *r1; + xfs_alloc_rec_t *r2; r1 = ar1; r2 = ar2; @@ -264,8 +264,8 @@ xfs_btree_check_rec( break; } case XFS_BTNUM_INO: { - xfs_inobt_rec_t *r1; - xfs_inobt_rec_t *r2; + xfs_inobt_rec_t *r1; + xfs_inobt_rec_t *r2; r1 = ar1; r2 = ar2; @@ -286,13 +286,13 @@ xfs_btree_check_rec( int /* error (0 or EFSCORRUPTED) */ xfs_btree_check_sblock( xfs_btree_cur_t *cur, /* btree cursor */ - xfs_btree_sblock_t *block, /* btree short form block pointer */ + xfs_btree_sblock_t *block, /* btree short form block pointer */ int level, /* level of the btree block */ xfs_buf_t *bp) /* buffer containing block */ { xfs_buf_t *agbp; /* buffer for ag. freespace struct */ xfs_agf_t *agf; /* ag. freespace structure */ - xfs_agblock_t agflen; /* native ag. freespace length */ + xfs_agblock_t agflen; /* native ag. freespace length */ int sblock_ok; /* block passes checks */ agbp = cur->bc_private.a.agbp; @@ -326,7 +326,7 @@ xfs_btree_check_sblock( */ int /* error (0 or EFSCORRUPTED) */ xfs_btree_check_sptr( - xfs_btree_cur_t *cur, /* btree cursor */ + xfs_btree_cur_t *cur, /* btree cursor */ xfs_agblock_t ptr, /* btree block disk address */ int level) /* btree block level */ { @@ -347,7 +347,7 @@ xfs_btree_check_sptr( */ void xfs_btree_del_cursor( - xfs_btree_cur_t *cur, /* btree cursor */ + xfs_btree_cur_t *cur, /* btree cursor */ int error) /* del because of error */ { int i; /* btree level */ @@ -386,14 +386,14 @@ xfs_btree_del_cursor( */ int /* error */ xfs_btree_dup_cursor( - xfs_btree_cur_t *cur, /* input cursor */ - xfs_btree_cur_t **ncur) /* output cursor */ + xfs_btree_cur_t *cur, /* input cursor */ + xfs_btree_cur_t **ncur) /* output cursor */ { xfs_buf_t *bp; /* btree block's buffer pointer */ int error; /* error return value */ int i; /* level number of btree block */ xfs_mount_t *mp; /* mount structure for filesystem */ - xfs_btree_cur_t *new; /* new cursor value */ + xfs_btree_cur_t *new; /* new cursor value */ xfs_trans_t *tp; /* transaction pointer, can be NULL */ tp = cur->bc_tp; @@ -449,7 +449,7 @@ xfs_btree_firstrec( xfs_btree_cur_t *cur, /* btree cursor */ int level) /* level to change */ { - xfs_btree_block_t *block; /* generic btree block pointer */ + xfs_btree_block_t *block; /* generic btree block pointer */ xfs_buf_t *bp; /* buffer containing block */ /* @@ -479,7 +479,7 @@ xfs_btree_get_block( int level, /* level in btree */ xfs_buf_t **bpp) /* buffer containing the block */ { - xfs_btree_block_t *block; /* return value */ + xfs_btree_block_t *block; /* return value */ xfs_buf_t *bp; /* return buffer */ xfs_ifork_t *ifp; /* inode fork pointer */ int whichfork; /* data or attr fork */ @@ -561,7 +561,7 @@ xfs_btree_init_cursor( { xfs_agf_t *agf; /* (A) allocation group freespace */ xfs_agi_t *agi; /* (I) allocation group inodespace */ - xfs_btree_cur_t *cur; /* return value */ + xfs_btree_cur_t *cur; /* return value */ xfs_ifork_t *ifp; /* (I) inode fork pointer */ int nlevels=0; /* number of levels in the btree */ @@ -643,7 +643,7 @@ xfs_btree_islastblock( xfs_btree_cur_t *cur, /* btree cursor */ int level) /* level to check */ { - xfs_btree_block_t *block; /* generic btree block pointer */ + xfs_btree_block_t *block; /* generic btree block pointer */ xfs_buf_t *bp; /* buffer containing block */ block = xfs_btree_get_block(cur, level, &bp); @@ -656,14 +656,14 @@ xfs_btree_islastblock( /* * Change the cursor to point to the last record in the current block - * at the given level. Other levels are unaffected. + * at the given level. Other levels are unaffected. */ int /* success=1, failure=0 */ xfs_btree_lastrec( xfs_btree_cur_t *cur, /* btree cursor */ int level) /* level to change */ { - xfs_btree_block_t *block; /* generic btree block pointer */ + xfs_btree_block_t *block; /* generic btree block pointer */ xfs_buf_t *bp; /* buffer containing block */ /* diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c index 427514933..77662719f 100644 --- a/libxfs/xfs_da_btree.c +++ b/libxfs/xfs_da_btree.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -697,7 +697,7 @@ xfs_da_join(xfs_da_state_t *state) } /* - * We have only one entry in the root. Copy the only remaining child of + * We have only one entry in the root. Copy the only remaining child of * the old root to block 0 as the new root node. */ STATIC int @@ -879,7 +879,6 @@ xfs_da_node_toosmall(xfs_da_state_t *state, int *action) return(0); } - /* * Walk back up the tree adjusting hash values as necessary, * when we stop making changes, return. @@ -936,8 +935,6 @@ xfs_da_fixhashpath(xfs_da_state_t *state, xfs_da_state_path_t *path) } } - - /* * Remove an entry from an intermediate node. */ @@ -1038,7 +1035,6 @@ xfs_da_node_unbalance(xfs_da_state_t *state, xfs_da_state_blk_t *drop_blk, save_blk->hashval = INT_GET(save_node->btree[ INT_GET(save_node->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT); } - /*======================================================================== * Routines used for finding things in the Btree. *========================================================================*/ @@ -1208,7 +1204,6 @@ xfs_da_node_lookup_int(xfs_da_state_t *state, int *result) return(0); } - /*======================================================================== * Utility routines. *========================================================================*/ @@ -1313,7 +1308,6 @@ xfs_da_blk_link(xfs_da_state_t *state, xfs_da_state_blk_t *old_blk, return(0); } - /* * Compare two intermediate nodes for "order". */ @@ -1336,7 +1330,6 @@ xfs_da_node_order(xfs_dabuf_t *node1_bp, xfs_dabuf_t *node2_bp) return(0); } - /* * Pick up the last hashvalue from an intermediate node. */ @@ -1560,7 +1553,7 @@ xfs_da_hashname(uchar_t *name, int namelen) { xfs_dahash_t hash; -#define ROTL(x,y) (((x) << (y)) | ((x) >> (32 - (y)))) +#define ROTL(x,y) (((x) << (y)) | ((x) >> (32 - (y)))) #ifdef SLOWVERSION /* * This is the old one-byte-at-a-time version. @@ -1606,7 +1599,7 @@ xfs_da_grow_inode(xfs_da_args_t *args, xfs_dablk_t *new_blkno) { xfs_fileoff_t bno, b; xfs_bmbt_irec_t map; - xfs_bmbt_irec_t *mapp; + xfs_bmbt_irec_t *mapp; xfs_inode_t *dp; int nmap, error, w, count, c, got, i, mapi; xfs_fsize_t size; @@ -1654,7 +1647,7 @@ xfs_da_grow_inode(xfs_da_args_t *args, xfs_dablk_t *new_blkno) } /* * If we didn't get it and the block might work if fragmented, - * try without the CONTIG flag. Loop until we get it all. + * try without the CONTIG flag. Loop until we get it all. */ else if (nmap == 0 && count > 1) { mapp = kmem_alloc(sizeof(*mapp) * count, KM_SLEEP); @@ -1710,9 +1703,8 @@ xfs_da_grow_inode(xfs_da_args_t *args, xfs_dablk_t *new_blkno) return 0; } - /* - * Ick. We need to always be able to remove a btree block, even + * Ick. We need to always be able to remove a btree block, even * if there's no space reservation because the filesystem is full. * This is called if xfs_bunmapi on a btree block fails due to ENOSPC. * It swaps the target block with the last block in the file. The @@ -1991,7 +1983,7 @@ done: STATIC int xfs_da_map_covers_blocks( int nmap, - xfs_bmbt_irec_t *mapp, + xfs_bmbt_irec_t *mapp, xfs_dablk_t bno, int count) { @@ -2030,8 +2022,8 @@ xfs_da_do_buf( xfs_buf_t **bplist; int error=0; int i; - xfs_bmbt_irec_t map; - xfs_bmbt_irec_t *mapp; + xfs_bmbt_irec_t map; + xfs_bmbt_irec_t *mapp; xfs_daddr_t mappedbno; xfs_mount_t *mp; int nbplist=0; diff --git a/libxfs/xfs_dir.c b/libxfs/xfs_dir.c index 052f1f0c1..a9e30f2ec 100644 --- a/libxfs/xfs_dir.c +++ b/libxfs/xfs_dir.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -32,6 +32,7 @@ #include + /* * xfs_dir.c * diff --git a/libxfs/xfs_dir2.c b/libxfs/xfs_dir2.c index a82f2cee4..3bb70f975 100644 --- a/libxfs/xfs_dir2.c +++ b/libxfs/xfs_dir2.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -206,7 +206,7 @@ xfs_dir2_removename( int namelen, /* name length of entry to remove */ xfs_ino_t ino, /* inode number of entry to remove */ xfs_fsblock_t *first, /* bmap's firstblock */ - xfs_bmap_free_t *flist, /* bmap's freeblock list */ + xfs_bmap_free_t *flist, /* bmap's freeblock list */ xfs_extlen_t total) /* bmap's total block count */ { xfs_da_args_t args; /* operation arguments */ @@ -258,7 +258,7 @@ xfs_dir2_replace( int namelen, /* name length of entry to replace */ xfs_ino_t inum, /* new inode number */ xfs_fsblock_t *first, /* bmap's firstblock */ - xfs_bmap_free_t *flist, /* bmap's freeblock list */ + xfs_bmap_free_t *flist, /* bmap's freeblock list */ xfs_extlen_t total) /* bmap's total block count */ { xfs_da_args_t args; /* operation arguments */ @@ -323,9 +323,9 @@ xfs_dir2_grow_inode( int error; /* error return value */ int got; /* blocks actually mapped */ int i; /* temp mapping index */ - xfs_bmbt_irec_t map; /* single structure for bmap */ + xfs_bmbt_irec_t map; /* single structure for bmap */ int mapi; /* mapping index */ - xfs_bmbt_irec_t *mapp; /* bmap mapping structure(s) */ + xfs_bmbt_irec_t *mapp; /* bmap mapping structure(s) */ xfs_mount_t *mp; /* filesystem mount point */ int nmap; /* number of bmap entries */ xfs_trans_t *tp; /* transaction pointer */ diff --git a/libxfs/xfs_dir2_block.c b/libxfs/xfs_dir2_block.c index 1b80d388e..e9814448f 100644 --- a/libxfs/xfs_dir2_block.c +++ b/libxfs/xfs_dir2_block.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. diff --git a/libxfs/xfs_dir2_data.c b/libxfs/xfs_dir2_data.c index 9f6248948..40c387c9a 100644 --- a/libxfs/xfs_dir2_data.c +++ b/libxfs/xfs_dir2_data.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -35,8 +35,10 @@ * Core data block handling routines for XFS V2 directories. * See xfs_dir2_data.h for data structures. */ + #include + #ifdef DEBUG /* * Check the consistency of the data block. @@ -395,7 +397,7 @@ xfs_dir2_data_init( int i; /* bestfree index */ xfs_mount_t *mp; /* filesystem mount point */ xfs_trans_t *tp; /* transaction pointer */ - int t; /* temp */ + int t; /* temp */ dp = args->dp; mp = dp->i_mount; diff --git a/libxfs/xfs_dir2_leaf.c b/libxfs/xfs_dir2_leaf.c index 2b1bdef75..9205950a0 100644 --- a/libxfs/xfs_dir2_leaf.c +++ b/libxfs/xfs_dir2_leaf.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -528,7 +528,6 @@ xfs_dir2_leaf_addname( return 0; } - #ifdef DEBUG /* * Check the internal consistency of a leaf1 block. @@ -584,7 +583,7 @@ xfs_dir2_leaf_compact( xfs_dabuf_t *bp) /* leaf buffer */ { int from; /* source leaf index */ - xfs_dir2_leaf_t *leaf; /* leaf structure */ + xfs_dir2_leaf_t *leaf; /* leaf structure */ int loglow; /* first leaf entry to log */ int to; /* target leaf index */ @@ -640,7 +639,7 @@ xfs_dir2_leaf_compact_x1( int highstale; /* stale entry at/after index */ int index; /* insertion index */ int keepstale; /* source index of kept stale */ - xfs_dir2_leaf_t *leaf; /* leaf structure */ + xfs_dir2_leaf_t *leaf; /* leaf structure */ int lowstale; /* stale entry before index */ int newindex=0; /* new insertion index */ int to; /* destination copy index */ diff --git a/libxfs/xfs_dir2_node.c b/libxfs/xfs_dir2_node.c index 870a2f6cd..00461fe9b 100644 --- a/libxfs/xfs_dir2_node.c +++ b/libxfs/xfs_dir2_node.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -312,7 +312,7 @@ xfs_dir2_leafn_check( xfs_dabuf_t *bp) /* leaf buffer */ { int i; /* leaf index */ - xfs_dir2_leaf_t *leaf; /* leaf structure */ + xfs_dir2_leaf_t *leaf; /* leaf structure */ xfs_mount_t *mp; /* filesystem mount point */ int stale; /* count of stale leaves */ @@ -341,7 +341,7 @@ xfs_dir2_leafn_lasthash( xfs_dabuf_t *bp, /* leaf buffer */ int *count) /* count of entries in leaf */ { - xfs_dir2_leaf_t *leaf; /* leaf structure */ + xfs_dir2_leaf_t *leaf; /* leaf structure */ leaf = bp->data; ASSERT(INT_GET(leaf->hdr.info.magic, ARCH_CONVERT) == XFS_DIR2_LEAFN_MAGIC); @@ -602,8 +602,8 @@ xfs_dir2_leafn_moveents( int start_d, /* destination leaf index */ int count) /* count of leaves to copy */ { - xfs_dir2_leaf_t *leaf_d; /* destination leaf structure */ - xfs_dir2_leaf_t *leaf_s; /* source leaf structure */ + xfs_dir2_leaf_t *leaf_d; /* destination leaf structure */ + xfs_dir2_leaf_t *leaf_s; /* source leaf structure */ int stale; /* count stale leaves copied */ xfs_trans_t *tp; /* transaction pointer */ @@ -680,8 +680,8 @@ xfs_dir2_leafn_order( xfs_dabuf_t *leaf1_bp, /* leaf1 buffer */ xfs_dabuf_t *leaf2_bp) /* leaf2 buffer */ { - xfs_dir2_leaf_t *leaf1; /* leaf1 structure */ - xfs_dir2_leaf_t *leaf2; /* leaf2 structure */ + xfs_dir2_leaf_t *leaf1; /* leaf1 structure */ + xfs_dir2_leaf_t *leaf2; /* leaf2 structure */ leaf1 = leaf1_bp->data; leaf2 = leaf2_bp->data; @@ -760,7 +760,7 @@ xfs_dir2_leafn_rebalance( else isleft = 1; /* - * Calculate moved entry count. Positive means left-to-right, + * Calculate moved entry count. Positive means left-to-right, * negative means right-to-left. Then move the entries. */ count = INT_GET(leaf1->hdr.count, ARCH_CONVERT) - mid + (isleft == 0); @@ -870,7 +870,7 @@ xfs_dir2_leafn_remove( xfs_dabuf_t *fbp; /* freeblock buffer */ xfs_dir2_db_t fdb; /* freeblock block number */ int findex; /* index in freeblock entries */ - xfs_dir2_free_t *free; /* freeblock structure */ + xfs_dir2_free_t *free; /* freeblock structure */ int logfree; /* need to log free entry */ /* @@ -1304,7 +1304,6 @@ done: return rval; } - /* * Add the data entry for a node-format directory name addition. * The leaf entry is added in xfs_dir2_leafn_add. @@ -1347,7 +1346,7 @@ xfs_dir2_node_addname_int( foundhole = 0; /* * If we came in with a freespace block that means that lookup - * found an entry with our hash value. This is the freespace + * found an entry with our hash value. This is the freespace * block for that data entry. */ if (fblk) { @@ -1403,7 +1402,7 @@ xfs_dir2_node_addname_int( } /* * While we haven't identified a data block, search the freeblock - * data for a good data block. If we find a null freeblock entry, + * data for a good data block. If we find a null freeblock entry, * indicating a hole in the data blocks, remember that. */ while (dbno == -1) { diff --git a/libxfs/xfs_dir2_sf.c b/libxfs/xfs_dir2_sf.c index cc7d4294a..76c9a5077 100644 --- a/libxfs/xfs_dir2_sf.c +++ b/libxfs/xfs_dir2_sf.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -144,7 +144,7 @@ xfs_dir2_block_to_sf( char *ptr; /* current data pointer */ xfs_dir2_sf_entry_t *sfep; /* shortform entry */ xfs_dir2_sf_t *sfp; /* shortform structure */ - xfs_ino_t temp; + xfs_ino_t temp; xfs_dir2_trace_args_sb("block_to_sf", args, size, bp); dp = args->dp; @@ -456,7 +456,7 @@ xfs_dir2_sf_addname_hard( } /* * Get rid of the old directory, then allocate space for - * the new one. We do this so xfs_idata_realloc won't copy + * the new one. We do this so xfs_idata_realloc won't copy * the data. */ xfs_idata_realloc(dp, -old_isize, XFS_DATA_FORK); diff --git a/libxfs/xfs_dir_leaf.c b/libxfs/xfs_dir_leaf.c index 713744222..3f532f5c4 100644 --- a/libxfs/xfs_dir_leaf.c +++ b/libxfs/xfs_dir_leaf.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -32,6 +32,7 @@ #include + /* * xfs_dir_leaf.c * @@ -688,7 +689,7 @@ xfs_dir_leaf_add(xfs_dabuf_t *bp, xfs_da_args_t *args, int index) return(error); /* * After compaction, the block is guaranteed to have only one - * free region, in freemap[0]. If it is not big enough, give up. + * free region, in freemap[0]. If it is not big enough, give up. */ if (INT_GET(hdr->freemap[0].size, ARCH_CONVERT) < (entsize + (uint)sizeof(xfs_dir_leaf_entry_t))) @@ -1413,7 +1414,7 @@ xfs_dir_leaf_unbalance(xfs_da_state_t *state, xfs_da_state_blk_t *drop_blk, memset(tmpbuffer, 0, state->blocksize); tmp_leaf = (xfs_dir_leafblock_t *)tmpbuffer; tmp_hdr = &tmp_leaf->hdr; - tmp_hdr->info = save_hdr->info; /* struct copy */ + tmp_hdr->info = save_hdr->info; /* struct copy */ INT_ZERO(tmp_hdr->count, ARCH_CONVERT); INT_SET(tmp_hdr->firstused, ARCH_CONVERT, state->blocksize); if (INT_ISZERO(tmp_hdr->firstused, ARCH_CONVERT)) @@ -1445,7 +1446,6 @@ xfs_dir_leaf_unbalance(xfs_da_state_t *state, xfs_da_state_blk_t *drop_blk, save_blk->hashval = INT_GET(save_leaf->entries[ INT_GET(save_leaf->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT); } - /*======================================================================== * Routines used for finding things in the Btree. *========================================================================*/ diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c index 9b19b2a90..7e476a638 100644 --- a/libxfs/xfs_ialloc.c +++ b/libxfs/xfs_ialloc.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -114,9 +114,9 @@ xfs_ialloc_ag_alloc( int *alloc) { xfs_agi_t *agi; /* allocation group header */ - xfs_alloc_arg_t args; /* allocation argument structure */ + xfs_alloc_arg_t args; /* allocation argument structure */ int blks_per_cluster; /* fs blocks per inode cluster */ - xfs_btree_cur_t *cur; /* inode btree cursor */ + xfs_btree_cur_t *cur; /* inode btree cursor */ xfs_daddr_t d; /* disk addr of buffer */ int error; xfs_buf_t *fbuf; /* new free inodes' buffer */ @@ -132,7 +132,7 @@ xfs_ialloc_ag_alloc( static xfs_timestamp_t ztime; /* zero xfs timestamp */ int isaligned; /* inode allocation at stripe unit */ /* boundary */ - xfs_dinode_core_t dic; /* a dinode_core to copy to new */ + xfs_dinode_core_t dic; /* a dinode_core to copy to new */ /* inodes */ args.tp = tp; @@ -205,7 +205,7 @@ xfs_ialloc_ag_alloc( else args.alignment = 1; if ((error = xfs_alloc_vextent(&args))) - return error; + return error; } if (args.fsbno == NULLFSBLOCK) { @@ -356,7 +356,7 @@ xfs_ialloc_next_ag( /* * Select an allocation group to look for a free inode in, based on the parent - * inode and then mode. Return the allocation group buffer. + * inode and then mode. Return the allocation group buffer. */ STATIC xfs_buf_t * /* allocation group buffer */ xfs_ialloc_ag_select( @@ -482,10 +482,10 @@ nextag: * The arguments IO_agbp and alloc_done are defined to work within * the constraint of one allocation per transaction. * xfs_dialloc() is designed to be called twice if it has to do an - * allocation to make more free inodes. On the first call, + * allocation to make more free inodes. On the first call, * IO_agbp should be set to NULL. If an inode is available, * i.e., xfs_dialloc() did not need to do an allocation, an inode - * number is returned. In this case, IO_agbp would be set to the + * number is returned. In this case, IO_agbp would be set to the * current ag_buf and alloc_done set to false. * If an allocation needed to be done, xfs_dialloc would return * the current ag_buf in IO_agbp and set alloc_done to true. @@ -496,7 +496,7 @@ nextag: * guaranteed to have a free inode available. * * Once we successfully pick an inode its number is returned and the - * on-disk data structures are updated. The inode itself is not read + * on-disk data structures are updated. The inode itself is not read * in, since doing so would break ordering constraints with xfs_reclaim. */ int @@ -514,7 +514,7 @@ xfs_dialloc( xfs_buf_t *agbp; /* allocation group header's buffer */ xfs_agnumber_t agno; /* allocation group number */ xfs_agi_t *agi; /* allocation group header structure */ - xfs_btree_cur_t *cur; /* inode allocation btree cursor */ + xfs_btree_cur_t *cur; /* inode allocation btree cursor */ int error; /* error return value */ int i; /* result code */ int ialloced; /* inode allocation status */ @@ -526,10 +526,10 @@ xfs_dialloc( int offset; /* index of inode in chunk */ xfs_agino_t pagino; /* parent's a.g. relative inode # */ xfs_agnumber_t pagno; /* parent's allocation group number */ - xfs_inobt_rec_t rec; /* inode allocation record */ + xfs_inobt_rec_t rec; /* inode allocation record */ xfs_agnumber_t tagno; /* testing allocation group number */ - xfs_btree_cur_t *tcur; /* temp cursor */ - xfs_inobt_rec_t trec; /* temp inode allocation record */ + xfs_btree_cur_t *tcur; /* temp cursor */ + xfs_inobt_rec_t trec; /* temp inode allocation record */ if (*IO_agbp == NULL) { @@ -941,10 +941,10 @@ xfs_dilocate( __int32_t chunk_cnt; /* count of free inodes in chunk */ xfs_inofree_t chunk_free; /* mask of free inodes in chunk */ xfs_agblock_t cluster_agbno; /* first block in inode cluster */ - xfs_btree_cur_t *cur; /* inode btree cursor */ + xfs_btree_cur_t *cur; /* inode btree cursor */ int error; /* error code */ int i; /* temp state */ - int offset; /* index of inode in its buffer */ + int offset; /* index of inode in its buffer */ int offset_agbno; /* blks from chunk start to inode */ ASSERT(ino != NULLFSINO); diff --git a/libxfs/xfs_ialloc_btree.c b/libxfs/xfs_ialloc_btree.c index b3f119e86..3d6971cf2 100644 --- a/libxfs/xfs_ialloc_btree.c +++ b/libxfs/xfs_ialloc_btree.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -33,6 +33,7 @@ /* * Inode allocation management for XFS. */ + #include /* @@ -45,10 +46,10 @@ xfs_inobt_insrec( int level, /* level to insert record at */ xfs_agblock_t *bnop, /* i/o: block number inserted */ xfs_inobt_rec_t *recp, /* i/o: record data inserted */ - xfs_btree_cur_t **curp, /* output: new cursor replacing cur */ + xfs_btree_cur_t **curp, /* output: new cursor replacing cur */ int *stat) /* success/failure */ { - xfs_inobt_block_t *block; /* btree block record/key lives in */ + xfs_inobt_block_t *block; /* btree block record/key lives in */ xfs_buf_t *bp; /* buffer for block */ int error; /* error return value */ int i; /* loop index */ @@ -249,7 +250,7 @@ STATIC void xfs_inobt_log_block( xfs_trans_t *tp, /* transaction pointer */ xfs_buf_t *bp, /* buffer containing btree block */ - int fields) /* mask of fields: XFS_BB_... */ + int fields) /* mask of fields: XFS_BB_... */ { int first; /* first byte offset logged */ int last; /* last byte offset logged */ @@ -273,10 +274,10 @@ STATIC void xfs_inobt_log_keys( xfs_btree_cur_t *cur, /* btree cursor */ xfs_buf_t *bp, /* buffer containing btree block */ - int kfirst, /* index of first key to log */ + int kfirst, /* index of first key to log */ int klast) /* index of last key to log */ { - xfs_inobt_block_t *block; /* btree block to log from */ + xfs_inobt_block_t *block; /* btree block to log from */ int first; /* first byte offset logged */ xfs_inobt_key_t *kp; /* key pointer in btree block */ int last; /* last byte offset logged */ @@ -295,10 +296,10 @@ STATIC void xfs_inobt_log_ptrs( xfs_btree_cur_t *cur, /* btree cursor */ xfs_buf_t *bp, /* buffer containing btree block */ - int pfirst, /* index of first pointer to log */ + int pfirst, /* index of first pointer to log */ int plast) /* index of last pointer to log */ { - xfs_inobt_block_t *block; /* btree block to log from */ + xfs_inobt_block_t *block; /* btree block to log from */ int first; /* first byte offset logged */ int last; /* last byte offset logged */ xfs_inobt_ptr_t *pp; /* block-pointer pointer in btree blk */ @@ -317,10 +318,10 @@ STATIC void xfs_inobt_log_recs( xfs_btree_cur_t *cur, /* btree cursor */ xfs_buf_t *bp, /* buffer containing btree block */ - int rfirst, /* index of first record to log */ + int rfirst, /* index of first record to log */ int rlast) /* index of last record to log */ { - xfs_inobt_block_t *block; /* btree block to log from */ + xfs_inobt_block_t *block; /* btree block to log from */ int first; /* first byte offset logged */ int last; /* last byte offset logged */ xfs_inobt_rec_t *rp; /* record pointer for btree block */ @@ -412,8 +413,8 @@ xfs_inobt_lookup( */ else { int high; /* high entry number */ - xfs_inobt_key_t *kkbase=NULL;/* base of keys in block */ - xfs_inobt_rec_t *krbase=NULL;/* base of records in block */ + xfs_inobt_key_t *kkbase=NULL;/* base of keys in block */ + xfs_inobt_rec_t *krbase=NULL;/* base of records in block */ int low; /* low entry number */ /* @@ -451,12 +452,12 @@ xfs_inobt_lookup( * Get startino. */ if (level > 0) { - xfs_inobt_key_t *kkp; + xfs_inobt_key_t *kkp; kkp = kkbase + keyno - 1; startino = INT_GET(kkp->ir_startino, ARCH_CONVERT); } else { - xfs_inobt_rec_t *krp; + xfs_inobt_rec_t *krp; krp = krbase + keyno - 1; startino = INT_GET(krp->ir_startino, ARCH_CONVERT); @@ -559,7 +560,7 @@ xfs_inobt_lshift( xfs_inobt_rec_t *lrp=NULL; /* record pointer for left block */ int nrec; /* new number of left block entries */ xfs_buf_t *rbp; /* buffer for right (current) block */ - xfs_inobt_block_t *right; /* right (current) btree block */ + xfs_inobt_block_t *right; /* right (current) btree block */ xfs_inobt_key_t *rkp=NULL; /* key pointer for right block */ xfs_inobt_ptr_t *rpp=NULL; /* address pointer for right block */ xfs_inobt_rec_t *rrp=NULL; /* record pointer for right block */ @@ -689,7 +690,7 @@ xfs_inobt_newroot( { xfs_agi_t *agi; /* a.g. inode header */ xfs_alloc_arg_t args; /* allocation argument structure */ - xfs_inobt_block_t *block; /* one half of the old root block */ + xfs_inobt_block_t *block; /* one half of the old root block */ xfs_buf_t *bp; /* buffer containing block */ int error; /* error return value */ xfs_inobt_key_t *kp; /* btree key pointer */ @@ -702,7 +703,7 @@ xfs_inobt_newroot( xfs_inobt_ptr_t *pp; /* btree address pointer */ xfs_agblock_t rbno; /* right block number */ xfs_buf_t *rbp; /* right buffer pointer */ - xfs_inobt_block_t *right; /* right btree block */ + xfs_inobt_block_t *right; /* right btree block */ xfs_inobt_rec_t *rp; /* btree record pointer */ ASSERT(cur->bc_nlevels < XFS_IN_MAXLEVELS(cur->bc_mp)); @@ -845,7 +846,7 @@ xfs_inobt_rshift( xfs_inobt_ptr_t *lpp; /* address pointer for left block */ xfs_inobt_rec_t *lrp; /* record pointer for left block */ xfs_buf_t *rbp; /* buffer for right neighbor block */ - xfs_inobt_block_t *right; /* right neighbor btree block */ + xfs_inobt_block_t *right; /* right neighbor btree block */ xfs_inobt_key_t *rkp; /* key pointer for right block */ xfs_inobt_ptr_t *rpp; /* address pointer for right block */ xfs_inobt_rec_t *rrp=NULL; /* record pointer for right block */ @@ -966,7 +967,7 @@ xfs_inobt_split( int level, /* level to split */ xfs_agblock_t *bnop, /* output: block number allocated */ xfs_inobt_key_t *keyp, /* output: first key of new block */ - xfs_btree_cur_t **curp, /* output: new cursor */ + xfs_btree_cur_t **curp, /* output: new cursor */ int *stat) /* success/failure */ { xfs_alloc_arg_t args; /* allocation argument structure */ @@ -979,7 +980,7 @@ xfs_inobt_split( xfs_inobt_ptr_t *lpp; /* left btree address pointer */ xfs_inobt_rec_t *lrp; /* left btree record pointer */ xfs_buf_t *rbp; /* buffer for right block */ - xfs_inobt_block_t *right; /* right (new) btree block */ + xfs_inobt_block_t *right; /* right (new) btree block */ xfs_inobt_key_t *rkp; /* right btree key pointer */ xfs_inobt_ptr_t *rpp; /* right btree address pointer */ xfs_inobt_rec_t *rrp; /* right btree record pointer */ @@ -1134,7 +1135,7 @@ xfs_inobt_updkey( */ for (ptr = 1; ptr == 1 && level < cur->bc_nlevels; level++) { xfs_buf_t *bp; /* buffer for block */ - xfs_inobt_block_t *block; /* btree block */ + xfs_inobt_block_t *block; /* btree block */ #ifdef DEBUG int error; /* error return value */ #endif @@ -1168,7 +1169,7 @@ xfs_inobt_decrement( int level, /* level in btree, 0 is leaf */ int *stat) /* success/failure */ { - xfs_inobt_block_t *block; /* btree block */ + xfs_inobt_block_t *block; /* btree block */ int error; int lev; /* btree level */ @@ -1252,9 +1253,9 @@ xfs_inobt_get_rec( __int32_t *fcnt, /* output: number of free inodes */ xfs_inofree_t *free, /* output: free inode mask */ int *stat, /* output: success/failure */ - xfs_arch_t arch) /* input: architecture */ + xfs_arch_t arch) /* input: architecture */ { - xfs_inobt_block_t *block; /* btree block */ + xfs_inobt_block_t *block; /* btree block */ xfs_buf_t *bp; /* buffer containing btree block */ #ifdef DEBUG int error; /* error return value */ @@ -1304,7 +1305,7 @@ xfs_inobt_increment( int level, /* level in btree, 0 is leaf */ int *stat) /* success/failure */ { - xfs_inobt_block_t *block; /* btree block */ + xfs_inobt_block_t *block; /* btree block */ xfs_buf_t *bp; /* buffer containing btree block */ int error; /* error return value */ int lev; /* btree level */ @@ -1391,16 +1392,16 @@ xfs_inobt_increment( */ int /* error */ xfs_inobt_insert( - xfs_btree_cur_t *cur, /* btree cursor */ + xfs_btree_cur_t *cur, /* btree cursor */ int *stat) /* success/failure */ { int error; /* error return value */ int i; /* result value, 0 for failure */ int level; /* current level number in btree */ xfs_agblock_t nbno; /* new block number (split result) */ - xfs_btree_cur_t *ncur; /* new cursor (split result) */ - xfs_inobt_rec_t nrec; /* record being inserted this level */ - xfs_btree_cur_t *pcur; /* previous level's cursor */ + xfs_btree_cur_t *ncur; /* new cursor (split result) */ + xfs_inobt_rec_t nrec; /* record being inserted this level */ + xfs_btree_cur_t *pcur; /* previous level's cursor */ level = 0; nbno = NULLAGBLOCK; @@ -1451,7 +1452,7 @@ xfs_inobt_insert( */ int /* error */ xfs_inobt_lookup_eq( - xfs_btree_cur_t *cur, /* btree cursor */ + xfs_btree_cur_t *cur, /* btree cursor */ xfs_agino_t ino, /* starting inode of chunk */ __int32_t fcnt, /* free inode count */ xfs_inofree_t free, /* free inode mask */ @@ -1469,7 +1470,7 @@ xfs_inobt_lookup_eq( */ int /* error */ xfs_inobt_lookup_ge( - xfs_btree_cur_t *cur, /* btree cursor */ + xfs_btree_cur_t *cur, /* btree cursor */ xfs_agino_t ino, /* starting inode of chunk */ __int32_t fcnt, /* free inode count */ xfs_inofree_t free, /* free inode mask */ @@ -1487,7 +1488,7 @@ xfs_inobt_lookup_ge( */ int /* error */ xfs_inobt_lookup_le( - xfs_btree_cur_t *cur, /* btree cursor */ + xfs_btree_cur_t *cur, /* btree cursor */ xfs_agino_t ino, /* starting inode of chunk */ __int32_t fcnt, /* free inode count */ xfs_inofree_t free, /* free inode mask */ @@ -1511,7 +1512,7 @@ xfs_inobt_update( __int32_t fcnt, /* free inode count */ xfs_inofree_t free) /* free inode mask */ { - xfs_inobt_block_t *block; /* btree block to update */ + xfs_inobt_block_t *block; /* btree block to update */ xfs_buf_t *bp; /* buffer containing btree block */ int error; /* error return value */ int ptr; /* current record number (updating) */ @@ -1542,7 +1543,7 @@ xfs_inobt_update( * Updating first record in leaf. Pass new key value up to our parent. */ if (ptr == 1) { - xfs_inobt_key_t key; /* key containing [ino] */ + xfs_inobt_key_t key; /* key containing [ino] */ INT_SET(key.ir_startino, ARCH_CONVERT, ino); if ((error = xfs_inobt_updkey(cur, &key, 1))) diff --git a/libxfs/xfs_inode.c b/libxfs/xfs_inode.c index cf10b16a6..5c9e5ad29 100644 --- a/libxfs/xfs_inode.c +++ b/libxfs/xfs_inode.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -52,7 +52,7 @@ xfs_inobp_check( i * mp->m_sb.sb_inodesize); if (INT_ISZERO(dip->di_next_unlinked, ARCH_CONVERT)) { xfs_fs_cmn_err(CE_ALERT, mp, - "Detected a bogus zero next_unlinked field in incore inode buffer 0x%p. About to pop an ASSERT.", + "Detected a bogus zero next_unlinked field in incore inode buffer 0x%p. About to pop an ASSERT.", bp); ASSERT(!INT_ISZERO(dip->di_next_unlinked, ARCH_CONVERT)); } @@ -75,10 +75,10 @@ xfs_inobp_check( * to determine the size and location of the buffer to read from disk. * If the inode has already been mapped to its buffer and read in once, * then use the mapping information stored in the inode rather than - * calling xfs_imap(). This allows us to avoid the overhead of looking + * calling xfs_imap(). This allows us to avoid the overhead of looking * at the inode btree for small block file systems (see xfs_dilocate()). * We can tell whether the inode has been mapped in before by comparing - * its disk block address to 0. Only uninitialized inodes will have + * its disk block address to 0. Only uninitialized inodes will have * 0 for the disk block address. */ int @@ -149,7 +149,7 @@ xfs_itobp( ASSERT(bno == 0 || bno == imap.im_blkno); /* - * Read in the buffer. If tp is NULL, xfs_trans_read_buf() will + * Read in the buffer. If tp is NULL, xfs_trans_read_buf() will * default to just a read_buf() call. */ error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, imap.im_blkno, @@ -215,8 +215,8 @@ xfs_itobp( /* * Move inode type and inode format specific information from the - * on-disk inode to the in-core inode. For fifos, devs, and sockets - * this means set if_rdev to the proper value. For files, directories, + * on-disk inode to the in-core inode. For fifos, devs, and sockets + * this means set if_rdev to the proper value. For files, directories, * and symlinks this means to bring in the in-line data or extent * pointers. For a file in B-tree format, only the root is immediately * brought in-core. The rest will be in-lined in if_extents when it @@ -230,7 +230,7 @@ xfs_iformat( xfs_attr_shortform_t *atp; int size; int error; - xfs_fsize_t di_size; + xfs_fsize_t di_size; ip->i_df.if_ext_max = XFS_IFORK_DSIZE(ip) / (uint)sizeof(xfs_bmbt_rec_t); error = 0; @@ -559,10 +559,10 @@ xfs_iformat_btree( * xfs_xlate_dinode_core - translate an xfs_inode_core_t between ondisk * and native format * - * buf = on-disk representation - * dip = native representation - * dir = direction - +ve -> disk to native - * -ve -> native to disk + * buf = on-disk representation + * dip = native representation + * dir = direction - +ve -> disk to native + * -ve -> native to disk * arch = on-disk architecture */ @@ -570,8 +570,8 @@ void xfs_xlate_dinode_core(xfs_caddr_t buf, xfs_dinode_core_t *dip, int dir, xfs_arch_t arch) { - xfs_dinode_core_t *buf_core; - xfs_dinode_core_t *mem_core; + xfs_dinode_core_t *buf_core; + xfs_dinode_core_t *mem_core; ASSERT(dir); @@ -587,15 +587,15 @@ xfs_xlate_dinode_core(xfs_caddr_t buf, xfs_dinode_core_t *dip, return; } - INT_XLATE(buf_core->di_magic, mem_core->di_magic, dir, arch); - INT_XLATE(buf_core->di_mode, mem_core->di_mode, dir, arch); - INT_XLATE(buf_core->di_version, mem_core->di_version, dir, arch); - INT_XLATE(buf_core->di_format, mem_core->di_format, dir, arch); - INT_XLATE(buf_core->di_onlink, mem_core->di_onlink, dir, arch); - INT_XLATE(buf_core->di_uid, mem_core->di_uid, dir, arch); - INT_XLATE(buf_core->di_gid, mem_core->di_gid, dir, arch); - INT_XLATE(buf_core->di_nlink, mem_core->di_nlink, dir, arch); - INT_XLATE(buf_core->di_projid, mem_core->di_projid, dir, arch); + INT_XLATE(buf_core->di_magic, mem_core->di_magic, dir, arch); + INT_XLATE(buf_core->di_mode, mem_core->di_mode, dir, arch); + INT_XLATE(buf_core->di_version, mem_core->di_version, dir, arch); + INT_XLATE(buf_core->di_format, mem_core->di_format, dir, arch); + INT_XLATE(buf_core->di_onlink, mem_core->di_onlink, dir, arch); + INT_XLATE(buf_core->di_uid, mem_core->di_uid, dir, arch); + INT_XLATE(buf_core->di_gid, mem_core->di_gid, dir, arch); + INT_XLATE(buf_core->di_nlink, mem_core->di_nlink, dir, arch); + INT_XLATE(buf_core->di_projid, mem_core->di_projid, dir, arch); if (dir>0) { memcpy(mem_core->di_pad, buf_core->di_pad, sizeof(buf_core->di_pad)); @@ -612,18 +612,18 @@ xfs_xlate_dinode_core(xfs_caddr_t buf, xfs_dinode_core_t *dip, INT_XLATE(buf_core->di_ctime.t_sec, mem_core->di_ctime.t_sec, dir, arch); INT_XLATE(buf_core->di_ctime.t_nsec,mem_core->di_ctime.t_nsec, dir, arch); - INT_XLATE(buf_core->di_size, mem_core->di_size, dir, arch); - INT_XLATE(buf_core->di_nblocks, mem_core->di_nblocks, dir, arch); - INT_XLATE(buf_core->di_extsize, mem_core->di_extsize, dir, arch); + INT_XLATE(buf_core->di_size, mem_core->di_size, dir, arch); + INT_XLATE(buf_core->di_nblocks, mem_core->di_nblocks, dir, arch); + INT_XLATE(buf_core->di_extsize, mem_core->di_extsize, dir, arch); - INT_XLATE(buf_core->di_nextents, mem_core->di_nextents, dir, arch); - INT_XLATE(buf_core->di_anextents, mem_core->di_anextents, dir, arch); - INT_XLATE(buf_core->di_forkoff, mem_core->di_forkoff, dir, arch); - INT_XLATE(buf_core->di_aformat, mem_core->di_aformat, dir, arch); - INT_XLATE(buf_core->di_dmevmask, mem_core->di_dmevmask, dir, arch); - INT_XLATE(buf_core->di_dmstate, mem_core->di_dmstate, dir, arch); - INT_XLATE(buf_core->di_flags, mem_core->di_flags, dir, arch); - INT_XLATE(buf_core->di_gen, mem_core->di_gen, dir, arch); + INT_XLATE(buf_core->di_nextents, mem_core->di_nextents, dir, arch); + INT_XLATE(buf_core->di_anextents, mem_core->di_anextents, dir, arch); + INT_XLATE(buf_core->di_forkoff, mem_core->di_forkoff, dir, arch); + INT_XLATE(buf_core->di_aformat, mem_core->di_aformat, dir, arch); + INT_XLATE(buf_core->di_dmevmask, mem_core->di_dmevmask, dir, arch); + INT_XLATE(buf_core->di_dmstate, mem_core->di_dmstate, dir, arch); + INT_XLATE(buf_core->di_flags, mem_core->di_flags, dir, arch); + INT_XLATE(buf_core->di_gen, mem_core->di_gen, dir, arch); } @@ -658,7 +658,7 @@ xfs_iread( * Get pointer's to the on-disk inode and the buffer containing it. * If the inode number refers to a block outside the file system * then xfs_itobp() will return NULL. In this case we should - * return NULL as well. Set i_blkno to 0 so that xfs_itobp() will + * return NULL as well. Set i_blkno to 0 so that xfs_itobp() will * know that this is a new incore inode. */ error = xfs_itobp(mp, tp, ip, &dip, &bp, bno); @@ -743,7 +743,7 @@ xfs_iread( ip->i_d.di_mode = 0; /* * Initialize the per-fork minima and maxima for a new - * inode here. xfs_iformat will do it for old inodes. + * inode here. xfs_iformat will do it for old inodes. */ ip->i_df.if_ext_max = XFS_IFORK_DSIZE(ip) / (uint)sizeof(xfs_bmbt_rec_t); @@ -752,10 +752,10 @@ xfs_iread( /* * The inode format changed when we moved the link count and * made it 32 bits long. If this is an old format inode, - * convert it in memory to look like a new one. If it gets + * convert it in memory to look like a new one. If it gets * flushed to disk we will convert back before flushing or - * logging it. We zero out the new projid field and the old link - * count field. We'll handle clearing the pad field (the remains + * logging it. We zero out the new projid field and the old link + * count field. We'll handle clearing the pad field (the remains * of the old uuid field) when we actually convert the inode to * the new format. We don't change the version number so that we * can distinguish this from a real new format inode. @@ -770,7 +770,7 @@ xfs_iread( /* * Mark the buffer containing the inode as something to keep - * around for a while. This helps to keep recently accessed + * around for a while. This helps to keep recently accessed * meta-data in-core longer. */ XFS_BUF_SET_REF(bp, XFS_INO_REF); @@ -781,7 +781,7 @@ xfs_iread( * in xfs_itobp() above. If tp is NULL, this is just a normal * brelse(). If we're within a transaction, then xfs_trans_brelse() * will only release the buffer if it is not dirty within the - * transaction. It will be OK to release the buffer in this case, + * transaction. It will be OK to release the buffer in this case, * because inodes on disk are never destroyed and we will be * locking the new in-core inode before putting it in the hash * table where other processes can find it. Thus we don't have diff --git a/libxfs/xfs_mount.c b/libxfs/xfs_mount.c index d2d9316ab..b08248f17 100644 --- a/libxfs/xfs_mount.c +++ b/libxfs/xfs_mount.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -295,4 +295,3 @@ xfs_initialize_perag(xfs_mount_t *mp, int agcount) } mp->m_maxagi = index; } - diff --git a/libxfs/xfs_rtalloc.c b/libxfs/xfs_rtalloc.c index e33fc461a..200d859ea 100644 --- a/libxfs/xfs_rtalloc.c +++ b/libxfs/xfs_rtalloc.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. @@ -33,6 +33,7 @@ /* * Free realtime space allocation for XFS. */ + #include extern int xfs_lowbit32(__uint32_t); diff --git a/libxfs/xfs_trans.c b/libxfs/xfs_trans.c index 4387b2fde..63e493631 100644 --- a/libxfs/xfs_trans.c +++ b/libxfs/xfs_trans.c @@ -11,7 +11,7 @@ * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or + * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. diff --git a/libxlog/Makefile b/libxlog/Makefile index 5da3d6447..dc5024d5d 100644 --- a/libxlog/Makefile +++ b/libxlog/Makefile @@ -1,32 +1,32 @@ # # Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # diff --git a/libxlog/util.c b/libxlog/util.c index 877043d9e..a00829a0e 100644 --- a/libxlog/util.c +++ b/libxlog/util.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -40,55 +40,55 @@ static int header_check_uuid(xfs_mount_t *mp, xlog_rec_header_t *head) { char uu_log[64], uu_sb[64]; - + if (!uuid_compare(mp->m_sb.sb_uuid, head->h_fs_uuid)) return 0; uuid_unparse(mp->m_sb.sb_uuid, uu_sb); uuid_unparse(head->h_fs_uuid, uu_log); printf(_("* ERROR: mismatched uuid in log\n" - "* SB : %s\n* log: %s\n"), - uu_sb, uu_log); + "* SB : %s\n* log: %s\n"), + uu_sb, uu_log); memcpy(&mp->m_sb.sb_uuid, head->h_fs_uuid, sizeof(uuid_t)); - + return 0; } int xlog_header_check_recover(xfs_mount_t *mp, xlog_rec_header_t *head) { - if (print_record_header) - printf(_("\nLOG REC AT LSN cycle %d block %d (0x%x, 0x%x)\n"), - CYCLE_LSN(head->h_lsn, ARCH_CONVERT), - BLOCK_LSN(head->h_lsn, ARCH_CONVERT), - CYCLE_LSN(head->h_lsn, ARCH_CONVERT), - BLOCK_LSN(head->h_lsn, ARCH_CONVERT)); - + if (print_record_header) + printf(_("\nLOG REC AT LSN cycle %d block %d (0x%x, 0x%x)\n"), + CYCLE_LSN(head->h_lsn, ARCH_CONVERT), + BLOCK_LSN(head->h_lsn, ARCH_CONVERT), + CYCLE_LSN(head->h_lsn, ARCH_CONVERT), + BLOCK_LSN(head->h_lsn, ARCH_CONVERT)); + if (INT_GET(head->h_magicno, ARCH_CONVERT) != XLOG_HEADER_MAGIC_NUM) { - - printf(_("* ERROR: bad magic number in log header: 0x%x\n"), - INT_GET(head->h_magicno, ARCH_CONVERT)); - + + printf(_("* ERROR: bad magic number in log header: 0x%x\n"), + INT_GET(head->h_magicno, ARCH_CONVERT)); + } else if (header_check_uuid(mp, head)) { - - /* failed - fall through */ - + + /* failed - fall through */ + } else if (INT_GET(head->h_fmt, ARCH_CONVERT) != XLOG_FMT) { - + printf(_("* ERROR: log format incompatible (log=%d, ours=%d)\n"), - INT_GET(head->h_fmt, ARCH_CONVERT), XLOG_FMT); - + INT_GET(head->h_fmt, ARCH_CONVERT), XLOG_FMT); + } else { - /* everything is ok */ - return 0; + /* everything is ok */ + return 0; } - + /* bail out now or just carry on regardless */ if (print_exit) - xlog_exit(_("Bad log")); - - return 0; + xlog_exit(_("Bad log")); + + return 0; } int @@ -96,9 +96,9 @@ xlog_header_check_mount(xfs_mount_t *mp, xlog_rec_header_t *head) { if (uuid_is_null(head->h_fs_uuid)) return 0; if (header_check_uuid(mp, head)) { - /* bail out now or just carry on regardless */ - if (print_exit) - xlog_exit(_("Bad log")); + /* bail out now or just carry on regardless */ + if (print_exit) + xlog_exit(_("Bad log")); } return 0; } diff --git a/logprint/Makefile b/logprint/Makefile index 5d222c8cc..2a6e35b6e 100644 --- a/logprint/Makefile +++ b/logprint/Makefile @@ -1,32 +1,32 @@ # # Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # diff --git a/logprint/log_misc.c b/logprint/log_misc.c index 723997240..55f7d279b 100644 --- a/logprint/log_misc.c +++ b/logprint/log_misc.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -96,21 +96,21 @@ void print_xlog_op_line(void) { printf("--------------------------------------" - "--------------------------------------\n"); + "--------------------------------------\n"); } /* print_xlog_op_line */ void print_xlog_record_line(void) { printf("======================================" - "======================================\n"); + "======================================\n"); } /* print_xlog_record_line */ void print_stars(void) { printf("***********************************" - "***********************************\n"); + "***********************************\n"); } /* print_xlog_record_line */ /* @@ -217,16 +217,16 @@ xlog_print_trans_header(xfs_caddr_t *ptr, int len) char *magic_c = (char *)&magic; *ptr += len; - + magic=*(__uint32_t*)cptr; /* XXX INT_GET soon */ - + if (len >= 4) { #if __BYTE_ORDER == __LITTLE_ENDIAN - printf("%c%c%c%c:", - magic_c[3], magic_c[2], magic_c[1], magic_c[0]); + printf("%c%c%c%c:", + magic_c[3], magic_c[2], magic_c[1], magic_c[0]); #else - printf("%c%c%c%c:", - magic_c[0], magic_c[1], magic_c[2], magic_c[3]); + printf("%c%c%c%c:", + magic_c[0], magic_c[1], magic_c[2], magic_c[3]); #endif } if (len != sizeof(xfs_trans_header_t)) { @@ -256,7 +256,7 @@ xlog_print_trans_buffer(xfs_caddr_t *ptr, int len, int *i, int num_ops) xfs_buf_log_format_t lbuf; int size, blen, map_size, struct_size; long long x, y; - + /* * bcopy to ensure 8-byte alignment for the long longs in * buf_log_format_t structure @@ -328,14 +328,14 @@ xlog_print_trans_buffer(xfs_caddr_t *ptr, int len, int *i, int num_ops) */ bcopy(*ptr, &x, sizeof(long long)); bcopy(*ptr+8, &y, sizeof(long long)); - printf("icount: %lld ifree: %lld ", - INT_GET(x, ARCH_CONVERT), - INT_GET(y, ARCH_CONVERT)); + printf("icount: %lld ifree: %lld ", + INT_GET(x, ARCH_CONVERT), + INT_GET(y, ARCH_CONVERT)); bcopy(*ptr+16, &x, sizeof(long long)); bcopy(*ptr+24, &y, sizeof(long long)); - printf("fdblks: %lld frext: %lld\n", - INT_GET(x, ARCH_CONVERT), - INT_GET(y, ARCH_CONVERT)); + printf("fdblks: %lld frext: %lld\n", + INT_GET(x, ARCH_CONVERT), + INT_GET(y, ARCH_CONVERT)); } super_block = 0; } else if (INT_GET(*(uint *)(*ptr), ARCH_CONVERT) == XFS_AGI_MAGIC) { @@ -478,7 +478,7 @@ xlog_print_trans_efd(xfs_caddr_t *ptr, uint len) xfs_extent_t *ex; int i; xfs_efd_log_format_t lbuf; - + /* * bcopy to ensure 8-byte alignment for the long longs in * xfs_efd_log_format_t structure @@ -588,15 +588,15 @@ xlog_print_dir_sf(xfs_dir_shortform_t *sfp, int size) char namebuf[257]; xfs_dir_sf_entry_t *sfep; - /* XXX need to determine whether this is v1 or v2, then - print appropriate structure */ - + /* XXX need to determine whether this is v1 or v2, then + print appropriate structure */ + printf("SHORTFORM DIRECTORY size %d\n", - size); - /* bail out for now */ - - return; - + size); + /* bail out for now */ + + return; + printf("SHORTFORM DIRECTORY size %d count %d\n", size, sfp->hdr.count); bcopy(&(sfp->hdr.parent), &ino, sizeof(ino)); @@ -675,11 +675,11 @@ xlog_print_trans_inode(xfs_caddr_t *ptr, int len, int *i, int num_ops) /* core inode comes 2nd */ op_head = (xlog_op_header_t *)*ptr; xlog_print_op_header(op_head, *i, ptr); - + if (XLOG_SET(op_head->oh_flags, XLOG_CONTINUE_TRANS)) { return f->ilf_size-1; } - + bcopy(*ptr, &dino, sizeof(dino)); mode = dino.di_mode & IFMT; size = (int)dino.di_size; @@ -806,7 +806,7 @@ xlog_print_trans_dquot(xfs_caddr_t *ptr, int len, int *i, int num_ops) f = &lbuf; (*i)++; /* bump index */ *ptr += len; - + if (len == sizeof(xfs_dq_logformat_t)) { printf("#regs: %d id: 0x%x", f->qlf_size, f->qlf_id); printf(" blkno: %lld len: %d boff: %d\n", @@ -871,10 +871,10 @@ xlog_print_lseek(xlog_t *log, int fd, xfs_daddr_t blkno, int whence) void print_lsn(xfs_caddr_t string, xfs_lsn_t *lsn, - xfs_arch_t arch) + xfs_arch_t arch) { - printf("%s: %u,%u", string, - CYCLE_LSN(*lsn, arch), BLOCK_LSN(*lsn, arch)); + printf("%s: %u,%u", string, + CYCLE_LSN(*lsn, arch), BLOCK_LSN(*lsn, arch)); } @@ -894,10 +894,10 @@ xlog_print_record(int fd, if (print_no_print) return NO_ERROR; - + if (!len) { - printf("\n"); - return NO_ERROR; + printf("\n"); + return NO_ERROR; } /* read_len must read up to some block boundary */ @@ -925,7 +925,7 @@ xlog_print_record(int fd, *partial_buf = buf; return PARTIAL_READ; } - + /* Did we read everything? */ if ((ret == 0 && read_len != 0) || ret != read_len) { *read_type = ret; @@ -934,7 +934,7 @@ xlog_print_record(int fd, } if (*read_type != FULL_READ) read_len += *read_type; - + /* Everything read in. Start from beginning of buffer */ buf = ptr; for (i = 0; ptr < buf + read_len; ptr += BBSIZE, i++) { @@ -965,7 +965,7 @@ xlog_print_record(int fd, /* print transaction data */ if (print_no_data || ((XLOG_SET(op_head->oh_flags, XLOG_WAS_CONT_TRANS) || - XLOG_SET(op_head->oh_flags, XLOG_CONTINUE_TRANS)) && + XLOG_SET(op_head->oh_flags, XLOG_CONTINUE_TRANS)) && INT_GET(op_head->oh_len, ARCH_CONVERT) == 0)) { for (n = 0; n < INT_GET(op_head->oh_len, ARCH_CONVERT); n++) { printf("%c", *ptr); @@ -1030,7 +1030,7 @@ xlog_print_record(int fd, } default: { fprintf(stderr, "%s: unknown log operation type (%x)\n", - progname, *(unsigned short *)ptr); + progname, *(unsigned short *)ptr); skip = 0; ptr += INT_GET(op_head->oh_len, ARCH_CONVERT); } @@ -1052,63 +1052,63 @@ xlog_print_rec_head(xlog_rec_header_t *head, int *len) int i; char uub[64]; int datalen,bbs; - + if (print_no_print) return INT_GET(head->h_num_logops, ARCH_CONVERT); - + if (INT_ISZERO(head->h_magicno, ARCH_CONVERT)) - return ZEROED_LOG; + return ZEROED_LOG; if (INT_GET(head->h_magicno, ARCH_CONVERT) != XLOG_HEADER_MAGIC_NUM) { - printf("Header 0x%x wanted 0x%x\n", - INT_GET(head->h_magicno, ARCH_CONVERT), - XLOG_HEADER_MAGIC_NUM); + printf("Header 0x%x wanted 0x%x\n", + INT_GET(head->h_magicno, ARCH_CONVERT), + XLOG_HEADER_MAGIC_NUM); return BAD_HEADER; } - + datalen=INT_GET(head->h_len, ARCH_CONVERT); bbs=(datalen/BBSIZE)+(datalen%BBSIZE)?1:0; - - printf("cycle: %d version: %d ", - INT_GET(head->h_cycle, ARCH_CONVERT), - INT_GET(head->h_version, ARCH_CONVERT)); + + printf("cycle: %d version: %d ", + INT_GET(head->h_cycle, ARCH_CONVERT), + INT_GET(head->h_version, ARCH_CONVERT)); print_lsn(" lsn", &head->h_lsn, ARCH_CONVERT); print_lsn(" tail_lsn", &head->h_tail_lsn, ARCH_CONVERT); printf("\n"); printf("length of Log Record: %d prev offset: %d num ops: %d\n", - datalen, - INT_GET(head->h_prev_block, ARCH_CONVERT), - INT_GET(head->h_num_logops, ARCH_CONVERT)); - + datalen, + INT_GET(head->h_prev_block, ARCH_CONVERT), + INT_GET(head->h_num_logops, ARCH_CONVERT)); + if (print_overwrite) { - printf("cycle num overwrites: "); - for (i=0; i< bbs; i++) + printf("cycle num overwrites: "); + for (i=0; i< bbs; i++) printf("%d - 0x%x ", - i, - INT_GET(head->h_cycle_data[i], ARCH_CONVERT)); - printf("\n"); + i, + INT_GET(head->h_cycle_data[i], ARCH_CONVERT)); + printf("\n"); } - + uuid_unparse(head->h_fs_uuid, uub); printf("uuid: %s format: ", uub); switch (INT_GET(head->h_fmt, ARCH_CONVERT)) { - case XLOG_FMT_UNKNOWN: - printf("unknown\n"); - break; - case XLOG_FMT_LINUX_LE: - printf("little endian linux\n"); - break; - case XLOG_FMT_LINUX_BE: - printf("big endian linux\n"); - break; - case XLOG_FMT_IRIX_BE: - printf("big endian irix\n"); - break; - default: - printf("? (%d)\n", INT_GET(head->h_fmt, ARCH_CONVERT)); - break; + case XLOG_FMT_UNKNOWN: + printf("unknown\n"); + break; + case XLOG_FMT_LINUX_LE: + printf("little endian linux\n"); + break; + case XLOG_FMT_LINUX_BE: + printf("big endian linux\n"); + break; + case XLOG_FMT_IRIX_BE: + printf("big endian irix\n"); + break; + default: + printf("? (%d)\n", INT_GET(head->h_fmt, ARCH_CONVERT)); + break; } - + *len = INT_GET(head->h_len, ARCH_CONVERT); return(INT_GET(head->h_num_logops, ARCH_CONVERT)); } /* xlog_print_rec_head */ @@ -1116,10 +1116,10 @@ xlog_print_rec_head(xlog_rec_header_t *head, int *len) static void print_xlog_bad_zeroed(xfs_daddr_t blkno) { - print_stars(); + print_stars(); printf("* ERROR: found data after zeroed blocks block=%-21lld *\n", - (long long)blkno); - print_stars(); + (long long)blkno); + print_stars(); if (print_exit) xlog_exit("Bad log - data after zeroed blocks"); } /* print_xlog_bad_zeroed */ @@ -1127,10 +1127,10 @@ print_xlog_bad_zeroed(xfs_daddr_t blkno) static void print_xlog_bad_header(xfs_daddr_t blkno, xfs_caddr_t buf) { - print_stars(); + print_stars(); printf("* ERROR: header cycle=%-11d block=%-21lld *\n", GET_CYCLE(buf, ARCH_CONVERT), (long long)blkno); - print_stars(); + print_stars(); if (print_exit) xlog_exit("Bad log record header"); } /* print_xlog_bad_header */ @@ -1138,10 +1138,10 @@ print_xlog_bad_header(xfs_daddr_t blkno, xfs_caddr_t buf) void print_xlog_bad_data(xfs_daddr_t blkno) { - print_stars(); - printf("* ERROR: data block=%-21lld *\n", - (long long)blkno); - print_stars(); + print_stars(); + printf("* ERROR: data block=%-21lld *\n", + (long long)blkno); + print_stars(); if (print_exit) xlog_exit("Bad data in log"); } /* print_xlog_bad_data */ @@ -1151,7 +1151,7 @@ print_xlog_bad_data(xfs_daddr_t blkno) * This code is gross and needs to be rewritten. */ void xfs_log_print(xlog_t *log, - int fd, + int fd, int print_block_start) { char hbuf[XLOG_HEADER_SIZE]; @@ -1162,7 +1162,7 @@ void xfs_log_print(xlog_t *log, int zeroed = 0; logBBsize = log->l_logBBsize; - + /* * Normally, block_start and block_end are the same value since we * are printing the entire log. However, if the start block is given, @@ -1178,13 +1178,13 @@ void xfs_log_print(xlog_t *log, block_start = print_block_start; xlog_print_lseek(log, fd, block_start, SEEK_SET); blkno = block_start; - + for (;;) { if (read(fd, hbuf, 512) == 0) { printf("%s: physical end of log\n", progname); print_xlog_record_line(); break; - } + } if (print_only_data) { printf("BLKNO: %lld\n", (long long)blkno); xlog_recover_print_data(hbuf, 512); @@ -1193,27 +1193,27 @@ void xfs_log_print(xlog_t *log, } num_ops = xlog_print_rec_head((xlog_rec_header_t *)hbuf, &len); blkno++; - - if (zeroed && num_ops != ZEROED_LOG) { - printf("%s: after %d zeroed blocks\n", progname, zeroed); - /* once we find zeroed blocks - that's all we expect */ - print_xlog_bad_zeroed(blkno-1); - /* reset count since we're assuming previous zeroed blocks - * were bad - */ - zeroed = 0; - } - - if (num_ops == ZEROED_LOG || num_ops == BAD_HEADER) { - if (num_ops == ZEROED_LOG) { - zeroed++; - } else { - print_xlog_bad_header(blkno-1, hbuf); - } - + + if (zeroed && num_ops != ZEROED_LOG) { + printf("%s: after %d zeroed blocks\n", progname, zeroed); + /* once we find zeroed blocks - that's all we expect */ + print_xlog_bad_zeroed(blkno-1); + /* reset count since we're assuming previous zeroed blocks + * were bad + */ + zeroed = 0; + } + + if (num_ops == ZEROED_LOG || num_ops == BAD_HEADER) { + if (num_ops == ZEROED_LOG) { + zeroed++; + } else { + print_xlog_bad_header(blkno-1, hbuf); + } + goto loop; } - + error = xlog_print_record(fd, num_ops, len, &read_type, &partial_buf, (xlog_rec_header_t *)hbuf); switch (error) { @@ -1233,9 +1233,9 @@ void xfs_log_print(xlog_t *log, goto loop; } case PARTIAL_READ: { - print_xlog_record_line(); + print_xlog_record_line(); printf("%s: physical end of log\n", progname); - print_xlog_record_line(); + print_xlog_record_line(); blkno = 0; xlog_print_lseek(log, fd, 0, SEEK_SET); /* @@ -1251,13 +1251,13 @@ void xfs_log_print(xlog_t *log, print_xlog_record_line(); loop: if (blkno >= logBBsize) { - if (zeroed) { - printf("%s: skipped %d zeroed blocks\n", progname, zeroed); - if (zeroed == logBBsize) - printf("%s: totally zeroed log\n", progname); - - zeroed=0; - } + if (zeroed) { + printf("%s: skipped %d zeroed blocks\n", progname, zeroed); + if (zeroed == logBBsize) + printf("%s: totally zeroed log\n", progname); + + zeroed=0; + } printf("%s: physical end of log\n", progname); print_xlog_record_line(); break; @@ -1280,14 +1280,14 @@ loop: } num_ops = xlog_print_rec_head((xlog_rec_header_t *)hbuf, &len); blkno++; - + if (num_ops == ZEROED_LOG || num_ops == BAD_HEADER) { - /* we only expect zeroed log entries at the end - * of the _physical_ log, so treat them the same - * as bad blocks here - */ + /* we only expect zeroed log entries at the end + * of the _physical_ log, so treat them the same + * as bad blocks here + */ print_xlog_bad_header(blkno-1, hbuf); - + if (blkno >= block_end) break; continue; @@ -1309,9 +1309,9 @@ partial_log_read: loop2: if (blkno >= block_end) break; - } + } } - + end: printf("%s: logical end of log\n", progname); print_xlog_record_line(); diff --git a/logprint/log_print_all.c b/logprint/log_print_all.c index c1f08d932..41917e3c4 100644 --- a/logprint/log_print_all.c +++ b/logprint/log_print_all.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -47,7 +47,7 @@ xlog_print_find_oldest( xfs_daddr_t first_blk; uint first_half_cycle, last_half_cycle; int error; - + if (xlog_find_zeroed(log, &first_blk)) return 0; @@ -76,8 +76,8 @@ xlog_print_find_oldest( void xlog_recover_print_data( - xfs_caddr_t p, - int len) + xfs_caddr_t p, + int len) { if (print_data) { uint *dp = (uint *)p; @@ -128,7 +128,7 @@ xlog_recover_print_buffer( printf("5.3 BUF: "); break; } - } + } if (f->blf_type == XFS_LI_BUF) { printf("#regs:%d start blkno:0x%llx len:%d bmap size:%d\n", f->blf_size, (long long)f->blf_blkno, f->blf_len, f->blf_map_size); @@ -149,12 +149,12 @@ xlog_recover_print_buffer( printf(" SUPER Block Buffer:\n"); if (!print_buffer) continue; printf(" icount:%Ld ifree:%Ld ", - INT_GET(*(long long *)(p), ARCH_CONVERT), - INT_GET(*(long long *)(p+8), ARCH_CONVERT)); + INT_GET(*(long long *)(p), ARCH_CONVERT), + INT_GET(*(long long *)(p+8), ARCH_CONVERT)); printf("fdblks:%Ld frext:%Ld\n", INT_GET(*(long long *)(p+16), ARCH_CONVERT), INT_GET(*(long long *)(p+24), ARCH_CONVERT)); - printf(" sunit:%u swidth:%u\n", + printf(" sunit:%u swidth:%u\n", INT_GET(*(uint *)(p+56), ARCH_CONVERT), INT_GET(*(uint *)(p+60), ARCH_CONVERT)); } else if (INT_GET(*(uint *)p, ARCH_CONVERT) == XFS_AGI_MAGIC) { @@ -201,7 +201,7 @@ xlog_recover_print_buffer( ddq = (xfs_disk_dquot_t *)p; printf(" DQUOT Buffer:\n"); if (!print_buffer) continue; - printf(" UIDs 0x%lx-0x%lx\n", + printf(" UIDs 0x%lx-0x%lx\n", (unsigned long)INT_GET(ddq->d_id, ARCH_CONVERT), (unsigned long)INT_GET(ddq->d_id, ARCH_CONVERT) + (BBTOB(f->blf_len) / sizeof(xfs_dqblk_t)) - 1); @@ -222,7 +222,7 @@ xlog_recover_print_quotaoff( qoff_f = (xfs_qoff_logformat_t *)item->ri_buf[0].i_addr; ASSERT(qoff_f); - if (qoff_f->qf_flags & XFS_UQUOTA_ACCT) + if (qoff_f->qf_flags & XFS_UQUOTA_ACCT) strcpy(str, "USER QUOTA"); if (qoff_f->qf_flags & XFS_GQUOTA_ACCT) strcat(str, "GROUP QUOTA"); @@ -235,7 +235,7 @@ STATIC void xlog_recover_print_dquot( xlog_recover_item_t *item) { - xfs_dq_logformat_t *f; + xfs_dq_logformat_t *f; xfs_disk_dquot_t *d; f = (xfs_dq_logformat_t *)item->ri_buf[0].i_addr; @@ -276,7 +276,7 @@ xlog_recover_print_inode_core( return; printf(" magic:%c%c mode:0x%x ver:%d format:%d " "onlink:%d\n", - (di->di_magic>>8) & 0xff, di->di_magic & 0xff, + (di->di_magic>>8) & 0xff, di->di_magic & 0xff, di->di_mode, di->di_version, di->di_format, di->di_onlink); printf(" uid:%d gid:%d nlink:%d projid:%d\n", di->di_uid, di->di_gid, di->di_nlink, (uint)di->di_projid); @@ -404,7 +404,7 @@ xlog_recover_print_inode( } } } - + } /* xlog_recover_print_inode */ @@ -421,7 +421,7 @@ xlog_recover_print_efd( * An xfs_efd_log_format structure contains a variable length array * as the last field. Each element is of size xfs_extent_t. */ - ASSERT(item->ri_buf[0].i_len == + ASSERT(item->ri_buf[0].i_len == sizeof(xfs_efd_log_format_t) + sizeof(xfs_extent_t) * (f->efd_nextents-1)); printf(" EFD: #regs: %d num_extents: %d id: 0x%llx\n", @@ -447,16 +447,16 @@ xlog_recover_print_efi( xfs_efi_log_format_t *f; xfs_extent_t *ex; int i; - + f = (xfs_efi_log_format_t *)item->ri_buf[0].i_addr; /* * An xfs_efi_log_format structure contains a variable length array * as the last field. Each element is of size xfs_extent_t. */ - ASSERT(item->ri_buf[0].i_len == + ASSERT(item->ri_buf[0].i_len == sizeof(xfs_efi_log_format_t) + sizeof(xfs_extent_t) * (f->efi_nextents-1)); - + printf(" EFI: #regs:%d num_extents:%d id:0x%llx\n", f->efi_size, f->efi_nextents, (unsigned long long)f->efi_id); ex = f->efi_extents; @@ -556,7 +556,7 @@ xlog_recover_print_item(xlog_recover_item_t *item) case XFS_LI_QUOTAOFF: { printf("QOFF"); break; - } + } default: { cmn_err(CE_PANIC, "xlog_recover_print_item: illegal type"); break; @@ -586,7 +586,7 @@ xlog_recover_print_trans(xlog_recover_t *trans, if (print < 3) return; - print_xlog_record_line(); + print_xlog_record_line(); xlog_recover_print_trans_head(trans); item = first_item = itemq; do { diff --git a/logprint/log_print_trans.c b/logprint/log_print_trans.c index 04b4c916c..eb9cc88ac 100644 --- a/logprint/log_print_trans.c +++ b/logprint/log_print_trans.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -34,12 +34,12 @@ void xlog_recover_print_trans_head( - xlog_recover_t *tr) + xlog_recover_t *tr) { - printf("TRANS: tid:0x%x type:%s #items:%d trans:0x%x q:0x%lx\n", - tr->r_log_tid, trans_type[tr->r_theader.th_type], - tr->r_theader.th_num_items, - tr->r_theader.th_tid, (long)tr->r_itemq); + printf("TRANS: tid:0x%x type:%s #items:%d trans:0x%x q:0x%lx\n", + tr->r_log_tid, trans_type[tr->r_theader.th_type], + tr->r_theader.th_num_items, + tr->r_theader.th_tid, (long)tr->r_itemq); } /* xlog_recover_print_trans_head */ int @@ -59,22 +59,22 @@ xfs_log_print_trans(xlog_t *log, xfs_daddr_t head_blk, tail_blk; if (xlog_find_tail(log, &head_blk, &tail_blk, 0)) - exit(1); - + exit(1); + printf(" log tail: %lld head: %lld state: %s\n", - (long long)tail_blk, - (long long)head_blk, - (tail_blk == head_blk)?"":""); - - if (print_block_start != -1) { + (long long)tail_blk, + (long long)head_blk, + (tail_blk == head_blk)?"":""); + + if (print_block_start != -1) { printf(" override tail: %lld\n", (long long)print_block_start); tail_blk = print_block_start; - } - printf("\n"); - - print_record_header=1; - if (xlog_do_recovery_pass(log, head_blk, tail_blk, XLOG_RECOVER_PASS1)) - exit(1); + } + printf("\n"); + + print_record_header=1; + if (xlog_do_recovery_pass(log, head_blk, tail_blk, XLOG_RECOVER_PASS1)) + exit(1); } /* xfs_log_print_trans */ diff --git a/logprint/logprint.c b/logprint/logprint.c index 55bb26cf3..cc9aaac29 100644 --- a/logprint/logprint.c +++ b/logprint/logprint.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -60,12 +60,12 @@ Options:\n\ -s block # to start printing\n\ -v print \"overwrite\" data\n\ -t print out transactional view\n\ - -b in transactional view, extract buffer info\n\ - -i in transactional view, extract inode info\n\ - -q in transactional view, extract quota info\n\ + -b in transactional view, extract buffer info\n\ + -i in transactional view, extract inode info\n\ + -q in transactional view, extract quota info\n\ -D print only data; no decoding\n\ - -V print version information\n", - progname); + -V print version information\n", + progname); exit(1); } @@ -89,12 +89,12 @@ logstat(libxfs_init_t *x) if (read(fd, buf, sizeof(buf)) != sizeof(buf)) { fprintf(stderr, " read of XFS superblock failed\n"); exit(1); - } - close (fd); + } + close (fd); if (!x->disfile) { - /* - * Conjure up a mount structure + /* + * Conjure up a mount structure */ libxfs_xlate_sb(buf, &(mp.m_sb), 1, ARCH_CONVERT, XFS_SB_ALL_BITS); sb = &(mp.m_sb); @@ -106,7 +106,7 @@ logstat(libxfs_init_t *x) fprintf(stderr, " external log device not specified\n\n"); usage(); /*NOTREACHED*/ - } + } } else { struct stat s; @@ -122,7 +122,7 @@ logstat(libxfs_init_t *x) x->logname, strerror(errno)); exit(1); } - close(fd); + close(fd); } else { /* Internal log */ x->logdev = x->ddev; } @@ -135,8 +135,8 @@ main(int argc, char **argv) { int print_start = -1; int c; - int logfd; - xlog_t log = {0}; + int logfd; + xlog_t log = {0}; progname = basename(argv[0]); while ((c = getopt(argc, argv, "befl:iqnors:tDVvc")) != EOF) { @@ -159,16 +159,16 @@ main(int argc, char **argv) x.lisfile = 1; break; } - case 'c': { - /* default is to stop on error. - * -c turns this off. - */ + case 'c': { + /* default is to stop on error. + * -c turns this off. + */ print_exit=0; break; } - case 'e': { - /* -e is now default - */ + case 'e': { + /* -e is now default + */ print_exit++; break; } @@ -199,15 +199,15 @@ main(int argc, char **argv) case 'V': { printf("%s version %s\n", progname, VERSION); exit(0); - } - case 'v': { - print_overwrite++; - break; + } + case 'v': { + print_overwrite++; + break; } case '?': { usage(); } - } + } } if (argc - optind != 1) @@ -222,14 +222,14 @@ main(int argc, char **argv) x.isreadonly = LIBXFS_ISINACTIVE; x.notvolmsg = "You should never see this message.\n"; - printf("xfs_logprint:\n"); + printf("xfs_logprint:\n"); if (!libxfs_init(&x)) exit(1); logstat(&x); logfd=(x.logfd<0)?(x.dfd):(x.logfd); - + printf(" data device: 0x%llx\n", (unsigned long long)x.ddev); if (x.logname) { @@ -248,12 +248,12 @@ main(int argc, char **argv) log.l_logsize = BBTOB(x.logBBsize); log.l_logBBstart = x.logBBstart; log.l_logBBsize = x.logBBsize; - log.l_mp = ∓ - + log.l_mp = ∓ + if (print_transactions) xfs_log_print_trans(&log, print_start); else xfs_log_print(&log, logfd, print_start); - + exit(0); } diff --git a/mkfile/Makefile b/mkfile/Makefile index 862c714db..5b1cd7e10 100644 --- a/mkfile/Makefile +++ b/mkfile/Makefile @@ -1,32 +1,32 @@ # # Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # diff --git a/mkfile/xfs_mkfile.c b/mkfile/xfs_mkfile.c index b198cb13d..c536e94c9 100644 --- a/mkfile/xfs_mkfile.c +++ b/mkfile/xfs_mkfile.c @@ -1,36 +1,36 @@ /* * Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ -/* +/* * Make file utility for xfs. */ diff --git a/po/Makefile b/po/Makefile index bc1505777..459f058bf 100644 --- a/po/Makefile +++ b/po/Makefile @@ -1,32 +1,32 @@ # # Copyright (c) 2001-2003 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # @@ -34,7 +34,7 @@ TOPDIR = .. include $(TOPDIR)/include/builddefs # Currently LINGUAS is undefined, so buildmacros provides no targets. -LINGUAS = +LINGUAS = LSRCFILES = $(LINGUAS:%=%.po) $(PKG_NAME).pot # TODO: db/ logprint/ diff --git a/repair/Makefile b/repair/Makefile index 346c2896b..ef6c0c780 100644 --- a/repair/Makefile +++ b/repair/Makefile @@ -1,32 +1,32 @@ # # Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # diff --git a/repair/README b/repair/README index c007af9f9..e912f7108 100644 --- a/repair/README +++ b/repair/README @@ -70,7 +70,7 @@ D - if quota inodes exist, the quota bits must be zeroed but they should be in a legal state (see xfs_quota.h). -D - if the quota flags are non-zero, the corresponding +D - if the quota flags are non-zero, the corresponding quota inodes must exist. quota inodes are never deleted, only their space @@ -168,7 +168,7 @@ D - 0) put inode tree flashover (call to add_ino_backptrs) into phase 5. D - 0) do set/get_inode_parent functions in incore_ino.c. also do is/set/ inode_processed. - + D - 0) do a versions.c to extract feature info and set global vars from the superblock version number and possibly feature bits @@ -326,7 +326,7 @@ ASSUMPTION: at end of phase 2, we've got superblocks and ag headers XXX if in no_modify mode, check for blocks claimed by one freespace btree and not the other - + Phase 3 -- traverse inodes to make the inodes, bmaps and freespace maps consistent. For each ag, use either the incore inode map or scan the ag for inodes. @@ -335,7 +335,7 @@ Phase 3 -- traverse inodes to make the inodes, bmaps and freespace maps when we traverse the directory heirarchy. If we lose both, we could scan the disk. Ugh. Maybe make that a command-line option that we support later. - + ASSUMPTION: we know if the ag allocation btrees are intact (phase 2) First - Walk and clear the ag unlinked lists. We'll process @@ -347,7 +347,7 @@ Phase 3 -- traverse inodes to make the inodes, bmaps and freespace maps above and get them into the inode tree if they're good. The incore inode cluster tree *always* has good clusters (alignment, etc.) in it. - + Third, make sure that the root inode is known. If not, and we know the inode number from the superblock, discover that inode and it's chunk. @@ -398,9 +398,9 @@ Phase 3 -- traverse inodes to make the inodes, bmaps and freespace maps current inode as allocated in the incore freespace bitmap. - - If inode is good and a directory, scan through it to + - If inode is good and a directory, scan through it to find leaf entries and discover any unknown inodes. - + For shortform, we correct what we can. If the directory is corrupt, we try and fix it in @@ -431,7 +431,7 @@ Phase 3 -- traverse inodes to make the inodes, bmaps and freespace maps in use, we'll mark in use then. If not, we'll clear it and mark the inode map. then in phase 4, you can depend on the inode map. - + Entries that point to non-existent or free inodes, and extra blocks in the directory will get fixed in place in a later pass. @@ -464,7 +464,7 @@ Assumption: All known inodes are now marked as in-use or free. Any Directories are semi-clean. All '.' entries are good. Root '..' entry is good if root inode exists. All entries - referencing non-existent inodes, free inodes, etc. + referencing non-existent inodes, free inodes, etc. XXX verify that either quota inode is 0 or NULLFSINO or if sb quota flag is non zero, verify that quota inode @@ -518,7 +518,7 @@ XXX HEURISTIC -- if we blow an inode away that has space, Clear the quota inodes if the inode btree says that they're not in use. The space freed will get picked up by phase 5. - + XXX Clear the quota inodes if the filesystem is being downgraded. - Phase 5 - Build inode allocation trees, freespace trees and @@ -528,12 +528,12 @@ XXX Clear the quota inodes if the filesystem is being downgraded. For each ag: (if no in no_modify mode) scan bitmap first to figure out number of extents. - + calculate space required for all trees. Start with inode trees. Setup the btree cursor which includes the list of preallocated blocks. As a by-product, this will delete the extents required for the inode tree from the incore extent tree. - + Calculate how many extents will be required to represent the remaining free extent tree on disk (twice, one for bybno and one for bycnt). You have to iterate on this because consuming @@ -549,7 +549,7 @@ XXX if in no_modify mode, scan the on-disk inode allocation there in phase2 and phase3. But if we cleared any inodes with space during phases 3 or 4, now is the time to complain. -XXX - Free duplicate extent lists. ??? +XXX - Free duplicate extent lists. ??? Assumptions: at this point, sim code having to do with inode creation/modification/deletion and space allocation @@ -562,7 +562,7 @@ Assumptions: at this point, sim code having to do with inode Free the bitmap, the freespace tree. - Flash the incore inode tree over from parent list to having + Flash the incore inode tree over from parent list to having full backpointers. realtime processing, if any -- @@ -572,7 +572,7 @@ Assumptions: at this point, sim code having to do with inode Generate the realtime bitmap from the incore realtime extent map and slam the info into the realtime bitmap inode. Generate summary info from the realtime extent map. - + XXX if in no_modify mode, compare contents of realtime bitmap inode to the incore realtime extent map. generate the summary info from the incore realtime extent map. @@ -614,7 +614,7 @@ XXX if in no_modify mode, compare contents of realtime bitmap If no realtime inodes, make them and if necessary, slam the summary info into the realtime summary inode. Ditto with the realtime bitmap inode. - + Make orphanage (lost+found ???). Traverse each directory from '/' (unless it was created). @@ -715,4 +715,3 @@ in parallel to process the AG set. I don't see how phase 6 can be run in parallel though. And running Phase 8 in parallel is just silly. - diff --git a/repair/agheader.c b/repair/agheader.c index 085b4072e..2355fa936 100644 --- a/repair/agheader.c +++ b/repair/agheader.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/repair/agheader.h b/repair/agheader.h index a0469f87b..46cc29953 100644 --- a/repair/agheader.h +++ b/repair/agheader.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -109,5 +109,3 @@ typedef struct fs_geo_list { #define XR_AG_AGF 0x2 #define XR_AG_AGI 0x4 #define XR_AG_SB_SEC 0x8 - - diff --git a/repair/attr_repair.c b/repair/attr_repair.c index 883a99402..91831f4c5 100644 --- a/repair/attr_repair.c +++ b/repair/attr_repair.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -46,12 +46,12 @@ static int xfs_mac_valid(xfs_mac_label_t *lp); /* - * For attribute repair, there are 3 formats to worry about. First, is + * For attribute repair, there are 3 formats to worry about. First, is * shortform attributes which reside in the inode. Second is the leaf * form, and lastly the btree. Much of this models after the directory - * structure so code resembles the directory repair cases. + * structure so code resembles the directory repair cases. * For shortform case, if an attribute looks corrupt, it is removed. - * If that leaves the shortform down to 0 attributes, it's okay and + * If that leaves the shortform down to 0 attributes, it's okay and * will appear to just have a null attribute fork. Some checks are done * for validity of the value field based on what the security needs are. * Calls will be made to xfs_mac_valid or xfs_acl_valid routines if the @@ -60,7 +60,7 @@ static int xfs_mac_valid(xfs_mac_label_t *lp); * requirements, but may in the future. * * For leaf block attributes, it requires more processing. One sticky - * point is that the attributes can be local (within the leaf) or + * point is that the attributes can be local (within the leaf) or * remote (outside the leaf in other blocks). Thinking of local only * if you get a bad attribute, and want to delete just one, its a-okay * if it remains large enough to still be a leaf block attribute. Otherwise, @@ -75,7 +75,7 @@ static int xfs_mac_valid(xfs_mac_label_t *lp); * attribute in the leaf block will make the entire attribute fork be * cleared. The simplest way to do that is to ignore the leaf format, and * call clear_dinode_attr to just make a shortform attribute fork with - * zero entries. + * zero entries. * * Another issue with handling repair on leaf attributes is the remote * blocks. To make sure that they look good and are not used multiple times @@ -106,10 +106,10 @@ valuecheck(char *namevalue, char *value, int namelen, int valuelen) void *valuep; int clearit = 0; - if ((strncmp(namevalue, SGI_ACL_FILE, SGI_ACL_FILE_SIZE) == 0) || - (strncmp(namevalue, SGI_ACL_DEFAULT, + if ((strncmp(namevalue, SGI_ACL_FILE, SGI_ACL_FILE_SIZE) == 0) || + (strncmp(namevalue, SGI_ACL_DEFAULT, SGI_ACL_DEFAULT_SIZE) == 0)) { - if (value == NULL) { + if (value == NULL) { bzero(&thisacl, sizeof(xfs_acl_t)); bcopy(namevalue+namelen, &thisacl, valuelen); valuep = &thisacl; @@ -127,12 +127,12 @@ valuecheck(char *namevalue, char *value, int namelen, int valuelen) bzero(&macl, sizeof(xfs_mac_label_t)); bcopy(namevalue+namelen, &macl, valuelen); valuep = &macl; - } else + } else valuep = value; if (xfs_mac_valid((xfs_mac_label_t *)valuep) != 1) { /* 1 is valid */ /* - * if sysconf says MAC enabled, + * if sysconf says MAC enabled, * temp = mac_from_text("msenhigh/mintlow", NULL) * copy it to value, update valuelen, totsize * This causes pushing up or down of all following @@ -166,21 +166,21 @@ int process_shortform_attr( xfs_ino_t ino, xfs_dinode_t *dip, - int *repair) + int *repair) { xfs_attr_shortform_t *asf; xfs_attr_sf_entry_t *currententry, *nextentry, *tempentry; int i, junkit; int currentsize, remainingspace; - + *repair = 0; asf = (xfs_attr_shortform_t *) XFS_DFORK_APTR_ARCH(dip, ARCH_CONVERT); /* Assumption: hdr.totsize is less than a leaf block and was checked - * by lclinode for valid sizes. Check the count though. + * by lclinode for valid sizes. Check the count though. */ - if (INT_GET(asf->hdr.count, ARCH_CONVERT) == 0) + if (INT_GET(asf->hdr.count, ARCH_CONVERT) == 0) /* then the total size should just be the header length */ if (INT_GET(asf->hdr.totsize, ARCH_CONVERT) != sizeof(xfs_attr_sf_hdr_t)) { /* whoops there's a discrepancy. Clear the hdr */ @@ -191,16 +191,16 @@ process_shortform_attr( INT_SET(asf->hdr.totsize, ARCH_CONVERT, sizeof(xfs_attr_sf_hdr_t)); *repair = 1; - return(1); + return(1); } else { do_warn( _("would junk the attribute fork since count is 0 for inode %llu\n"), ino); return(1); } - } - - currentsize = sizeof(xfs_attr_sf_hdr_t); + } + + currentsize = sizeof(xfs_attr_sf_hdr_t); remainingspace = INT_GET(asf->hdr.totsize, ARCH_CONVERT) - currentsize; nextentry = &asf->list[0]; for (i = 0; i < INT_GET(asf->hdr.count, ARCH_CONVERT); i++) { @@ -208,7 +208,7 @@ process_shortform_attr( junkit = 0; /* don't go off the end if the hdr.count was off */ - if ((currentsize + (sizeof(xfs_attr_sf_entry_t) - 1)) > + if ((currentsize + (sizeof(xfs_attr_sf_entry_t) - 1)) > INT_GET(asf->hdr.totsize, ARCH_CONVERT)) break; /* get out and reset count and totSize */ @@ -219,7 +219,7 @@ process_shortform_attr( do_warn( _(" truncating attributes for inode %llu to %d\n"), ino, i); *repair = 1; - break; /* and then update hdr fields */ + break; /* and then update hdr fields */ } else { do_warn( _(" would truncate attributes for inode %llu to %d\n"), ino, i); @@ -241,21 +241,21 @@ process_shortform_attr( do_warn( _(" truncating attributes for inode %llu to %d\n"), ino, i); - *repair = 1; + *repair = 1; break; /* and then update hdr fields */ } else { do_warn( _(" would truncate attributes for inode %llu to %d\n"), - ino, i); + ino, i); break; - } + } } } - - /* namecheck checks for / and null terminated for file names. + + /* namecheck checks for / and null terminated for file names. * attributes names currently follow the same rules. */ - if (namecheck((char *)¤tentry->nameval[0], + if (namecheck((char *)¤tentry->nameval[0], INT_GET(currententry->namelen, ARCH_CONVERT))) { do_warn( _("entry contains illegal character in shortform attribute name\n")); @@ -269,13 +269,13 @@ process_shortform_attr( } /* Only check values for root security attributes */ - if (INT_GET(currententry->flags, ARCH_CONVERT) & XFS_ATTR_ROOT) + if (INT_GET(currententry->flags, ARCH_CONVERT) & XFS_ATTR_ROOT) junkit = valuecheck((char *)¤tentry->nameval[0], - NULL, + NULL, INT_GET(currententry->namelen, ARCH_CONVERT), INT_GET(currententry->valuelen, ARCH_CONVERT)); - remainingspace = remainingspace - + remainingspace = remainingspace - XFS_ATTR_SF_ENTSIZE(currententry); if (junkit) { @@ -292,19 +292,19 @@ process_shortform_attr( i--; /* no worries, it will wrap back to 0 */ *repair = 1; continue; /* go back up now */ - } else { + } else { do_warn( _("would remove attribute entry %d for inode %llu\n"), i, ino); - } - } + } + } /* Let's get ready for the next entry... */ nextentry = (xfs_attr_sf_entry_t *) ((__psint_t) nextentry + XFS_ATTR_SF_ENTSIZE(currententry)); currentsize = currentsize + XFS_ATTR_SF_ENTSIZE(currententry); - + } /* end the loop */ if (INT_GET(asf->hdr.count, ARCH_CONVERT) != i) { @@ -320,7 +320,7 @@ process_shortform_attr( *repair = 1; } } - + /* ASSUMPTION: currentsize <= totsize */ if (INT_GET(asf->hdr.totsize, ARCH_CONVERT) != currentsize) { if (no_modify) { @@ -353,9 +353,9 @@ rmtval_get(xfs_mount_t *mp, xfs_ino_t ino, blkmap_t *blkmap, xfs_dfsbno_t bno; xfs_buf_t *bp; int clearit = 0, i = 0, length = 0, amountdone = 0; - + /* ASSUMPTION: valuelen is a valid number, so use it for looping */ - /* Note that valuelen is not a multiple of blocksize */ + /* Note that valuelen is not a multiple of blocksize */ while (amountdone < valuelen) { bno = blkmap_get(blkmap, blocknum + i); if (bno == NULLDFSBNO) { @@ -374,7 +374,7 @@ rmtval_get(xfs_mount_t *mp, xfs_ino_t ino, blkmap_t *blkmap, } ASSERT(mp->m_sb.sb_blocksize == XFS_BUF_COUNT(bp)); length = MIN(XFS_BUF_COUNT(bp), valuelen - amountdone); - bcopy(XFS_BUF_PTR(bp), value, length); + bcopy(XFS_BUF_PTR(bp), value, length); amountdone += length; value += length; i++; @@ -394,7 +394,7 @@ static da_freemap_t attr_freemap[DA_BMAP_SIZE]; * If any problems occur the routine returns with non-zero. In * this case the next step is to clear the attribute fork, by * changing it to shortform and zeroing it out. Forkoff need not - * be changed. + * be changed. */ int @@ -406,7 +406,7 @@ process_leaf_attr_block( blkmap_t *blkmap, xfs_dahash_t last_hashval, xfs_dahash_t *current_hashval, - int *repair) + int *repair) { xfs_attr_leaf_entry_t *entry; xfs_attr_leaf_name_local_t *local; @@ -415,7 +415,7 @@ process_leaf_attr_block( clearit = usedbs = 0; *repair = 0; - firstb = mp->m_sb.sb_blocksize; + firstb = mp->m_sb.sb_blocksize; stop = sizeof(xfs_attr_leaf_hdr_t); /* does the count look sorta valid? */ @@ -429,15 +429,15 @@ process_leaf_attr_block( da_bno, ino); return (1); } - + init_da_freemap(attr_freemap); (void) set_da_freemap(mp, attr_freemap, 0, stop); - + /* go thru each entry checking for problems */ - for (i = 0, entry = &leaf->entries[0]; + for (i = 0, entry = &leaf->entries[0]; i < INT_GET(leaf->hdr.count, ARCH_CONVERT); i++, entry++) { - + /* check if index is within some boundary. */ if (INT_GET(entry->nameidx, ARCH_CONVERT) > XFS_LBSIZE(mp)) { do_warn( @@ -471,9 +471,9 @@ process_leaf_attr_block( if (INT_GET(entry->flags, ARCH_CONVERT) & XFS_ATTR_LOCAL) { - local = XFS_ATTR_LEAF_NAME_LOCAL(leaf, i); - if ((INT_GET(local->namelen, ARCH_CONVERT) == 0) || - (namecheck((char *)&local->nameval[0], + local = XFS_ATTR_LEAF_NAME_LOCAL(leaf, i); + if ((INT_GET(local->namelen, ARCH_CONVERT) == 0) || + (namecheck((char *)&local->nameval[0], INT_GET(local->namelen, ARCH_CONVERT)))) { do_warn( _("attribute entry %d in attr block %u, inode %llu " @@ -486,13 +486,13 @@ process_leaf_attr_block( /* Check on the hash value. Checking order of values * is not necessary, since one wrong clears the whole - * fork. If the ordering's wrong, it's caught here or - * the kernel code has a bug with transaction logging + * fork. If the ordering's wrong, it's caught here or + * the kernel code has a bug with transaction logging * or attributes itself. Being paranoid, let's check - * ordering anyway in case both the name value and the - * hashvalue were wrong but matched. Unlikely, however. + * ordering anyway in case both the name value and the + * hashvalue were wrong but matched. Unlikely, however. */ - if (INT_GET(entry->hashval, ARCH_CONVERT) != + if (INT_GET(entry->hashval, ARCH_CONVERT) != libxfs_da_hashname((char *)&local->nameval[0], INT_GET(local->namelen, ARCH_CONVERT)) || @@ -507,7 +507,7 @@ process_leaf_attr_block( } /* Only check values for root security attributes */ - if (INT_GET(entry->flags, ARCH_CONVERT) & XFS_ATTR_ROOT) + if (INT_GET(entry->flags, ARCH_CONVERT) & XFS_ATTR_ROOT) if (valuecheck((char *)&local->nameval[0], NULL, INT_GET(local->namelen, ARCH_CONVERT), INT_GET(local->valuelen, ARCH_CONVERT))) { @@ -527,9 +527,9 @@ process_leaf_attr_block( /* do the remote case */ remotep = XFS_ATTR_LEAF_NAME_REMOTE(leaf, i); thissize = XFS_ATTR_LEAF_ENTSIZE_REMOTE( - INT_GET(remotep->namelen, ARCH_CONVERT)); + INT_GET(remotep->namelen, ARCH_CONVERT)); - if ((INT_GET(remotep->namelen, ARCH_CONVERT) == 0) || + if ((INT_GET(remotep->namelen, ARCH_CONVERT) == 0) || (namecheck((char *)&remotep->name[0], INT_GET(remotep->namelen, ARCH_CONVERT))) || (INT_GET(entry->hashval, ARCH_CONVERT) @@ -586,7 +586,7 @@ process_leaf_attr_block( } } - *current_hashval = last_hashval + *current_hashval = last_hashval = INT_GET(entry->hashval, ARCH_CONVERT); if (set_da_freemap(mp, attr_freemap, @@ -598,9 +598,9 @@ process_leaf_attr_block( i, da_bno, ino); clearit = 1; break; /* got an overlap */ - } + } usedbs += thissize; - if (INT_GET(entry->nameidx, ARCH_CONVERT) < firstb) + if (INT_GET(entry->nameidx, ARCH_CONVERT) < firstb) firstb = INT_GET(entry->nameidx, ARCH_CONVERT); } /* end the loop */ @@ -610,7 +610,7 @@ process_leaf_attr_block( /* if the holes flag is set, don't reset first_used unless it's * pointing to used bytes. we're being conservative here - * since the block will get compacted anyhow by the kernel. + * since the block will get compacted anyhow by the kernel. */ if ( (INT_GET(leaf->hdr.holes, ARCH_CONVERT) == 0 @@ -659,7 +659,7 @@ process_leaf_attr_block( * checking for holes and compacting if appropiate. I don't think * attributes need all that, so let's just leave the holes. If * we discover later that this is a good place to do compaction - * we can add it then. + * we can add it then. */ } return (clearit); /* and repair */ @@ -699,7 +699,7 @@ process_leaf_attr_level(xfs_mount_t *mp, if (dev_bno == NULLDFSBNO) { do_warn(_("can't map block %u for attribute fork " "for inode %llu\n"), da_bno, ino); - goto error_out; + goto error_out; } bp = libxfs_readbuf(mp->m_dev, XFS_FSB_TO_DADDR(mp, dev_bno), @@ -745,7 +745,7 @@ process_leaf_attr_level(xfs_mount_t *mp, da_cursor->level[0].bno = da_bno; da_cursor->level[0].index = INT_GET(leaf->hdr.count, ARCH_CONVERT); - da_cursor->level[0].dirty = repair; + da_cursor->level[0].dirty = repair; if (INT_GET(leaf->hdr.info.back, ARCH_CONVERT) != prev_bno) { do_warn(_("bad sibling back pointer for block %u in " @@ -799,9 +799,9 @@ error_out: * has more than just a block) btree. * * Note that if we run into any problems, we will trash the attribute fork. - * + * * returns 0 if things are ok, 1 if bad - * Note this code has been based off process_node_dir. + * Note this code has been based off process_node_dir. */ int process_node_attr( @@ -832,7 +832,7 @@ process_node_attr( * now process interior node. don't have any buffers held in this path. */ error = traverse_int_dablock(mp, &da_cursor, &bno, XFS_ATTR_FORK); - if (error == 0) + if (error == 0) return(1); /* 0 means unsuccessful */ /* @@ -840,7 +840,7 @@ process_node_attr( * the leaf dir level routine checks the interior paths * up to the root including the final right-most path. */ - + return (process_leaf_attr_level(mp, &da_cursor)); } @@ -929,9 +929,9 @@ process_longform_attr( 0, &next_hashval, repair)) { /* the block is bad. lose the attribute fork. */ libxfs_putbuf(bp); - return(1); + return(1); } - *repair = *repair || repairlinks; + *repair = *repair || repairlinks; break; case XFS_DA_NODE_MAGIC: /* btree-form attribute */ @@ -939,8 +939,8 @@ process_longform_attr( if (repairlinks) { *repair = 1; libxfs_writebuf(bp, 0); - } else - libxfs_putbuf(bp); + } else + libxfs_putbuf(bp); return (process_node_attr(mp, ino, dip, blkmap)); /* + repair */ default: do_warn(_("bad attribute leaf magic # %#x for dir ino %llu\n"), @@ -949,7 +949,7 @@ process_longform_attr( return(1); } - if (*repair && !no_modify) + if (*repair && !no_modify) libxfs_writebuf(bp, 0); else libxfs_putbuf(bp); @@ -974,7 +974,7 @@ xfs_acl_get_endian(xfs_acl_t *aclp) /* * returns 1 if attributes got cleared - * and 0 if things are ok. + * and 0 if things are ok. */ int process_attributes( @@ -1005,12 +1005,12 @@ process_attributes( } else { do_warn(_("illegal attribute format %d, ino %llu\n"), dinoc->di_aformat, ino); - err = 1; + err = 1; } return (err); /* and repair */ } -/* +/* * Validate an ACL */ static int @@ -1106,8 +1106,8 @@ xfs_mac_valid(xfs_mac_label_t *lp) /* * check whether the msentype value is valid, and do they have - * appropriate level, category association. - */ + * appropriate level, category association. + */ switch (lp->ml_msen_type) { case XFS_MSEN_ADMIN_LABEL: case XFS_MSEN_EQUAL_LABEL: diff --git a/repair/attr_repair.h b/repair/attr_repair.h index ea7b6a5a0..0dec185d0 100644 --- a/repair/attr_repair.h +++ b/repair/attr_repair.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef _XR_ATTRREPAIR_H diff --git a/repair/avl.c b/repair/avl.c index 25458bcea..38c7e82e1 100644 --- a/repair/avl.c +++ b/repair/avl.c @@ -1,33 +1,33 @@ /************************************************************************** * * * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ * * **************************************************************************/ @@ -193,7 +193,7 @@ retreat( * np gets pushed down to lesser child's * avl_forw branch. * - * np-> -D +B + * np-> -D +B * / \ / \ * child-> B deleted A -D * / \ / @@ -243,7 +243,7 @@ retreat( * child's avl_forw node gets promoted up, along with * its avl_forw subtree * - * np-> -G C + * np-> -G C * / \ / \ * child-> +B H -B G * / \ \ / / \ @@ -294,7 +294,7 @@ retreat( * np gets pushed down to greater child's * avl_back branch. * - * np-> +B -D + * np-> +B -D * / \ / \ * deleted D <-child +B E * / \ \ @@ -440,19 +440,19 @@ avl_delete( ASSERT(nnext->avl_nextino == np); nnext->avl_nextino = np->avl_nextino; /* - * Something preceeds np; np cannot be firstino. + * Something preceeds np; np cannot be firstino. */ ASSERT(tree->avl_firstino != np); } else { /* - * Nothing preceeding np; after deletion, np's nextino - * is firstino of tree. + * Nothing preceeding np; after deletion, np's nextino + * is firstino of tree. */ ASSERT(tree->avl_firstino == np); tree->avl_firstino = np->avl_nextino; } - + /* * Degenerate cases... @@ -506,7 +506,7 @@ attach: back->avl_forw = forw = np->avl_forw; forw->avl_parent = back; back->avl_parent = parent; - + if (parent) { if (parent->avl_forw == np) parent->avl_forw = back; @@ -538,7 +538,7 @@ attach: * / \ / \ * G J back-> G J (before retreat()) * / \ / \ - * F ?... F ?1 + * F ?... F ?1 * / \ * ? H <-forw * / @@ -551,7 +551,7 @@ attach: * Will be adjusted by retreat() below. */ forw->avl_balance = np->avl_balance; - + /* * forw inherits np's avl_forw... */ @@ -597,20 +597,20 @@ attach: /* - * avl_findanyrange: - * + * avl_findanyrange: + * * Given range r [start, end), find any range which is contained in r. * if checklen is non-zero, then only ranges of non-zero length are - * considered in finding a match. + * considered in finding a match. */ avlnode_t * avl_findanyrange( register avltree_desc_t *tree, register __psunsigned_t start, register __psunsigned_t end, - int checklen) + int checklen) { - register avlnode_t *np = tree->avl_root; + register avlnode_t *np = tree->avl_root; /* np = avl_findadjacent(tree, start, AVL_SUCCEED); */ while (np) { @@ -632,7 +632,7 @@ avl_findanyrange( continue; } /* if we were to add node with start, would - * have a growth of AVL_FORW; + * have a growth of AVL_FORW; */ /* we are looking for a succeeding node; * this is nextino. @@ -655,7 +655,7 @@ avl_findanyrange( return(np); } /* - * find non-zero length region + * find non-zero length region */ while (np && (AVL_END(tree, np) - AVL_START(tree, np) == 0) && (AVL_START(tree, np) < end)) @@ -817,7 +817,7 @@ avl_balance( / \ / \ child-> +B F -B E / \ / / \ - A +C A D F + A +C A D F \ D @@ -932,9 +932,9 @@ static avlnode_t * avl_insert_find_growth( register avltree_desc_t *tree, - register __psunsigned_t start, /* range start at start, */ - register __psunsigned_t end, /* exclusive */ - register int *growthp) /* OUT */ + register __psunsigned_t start, /* range start at start, */ + register __psunsigned_t end, /* exclusive */ + register int *growthp) /* OUT */ { avlnode_t *root = tree->avl_root; register avlnode_t *np; @@ -1090,7 +1090,7 @@ avl_insert( /* * * avl_insert_immediate(tree, afterp, newnode): - * insert newnode immediately into tree immediately after afterp. + * insert newnode immediately into tree immediately after afterp. * after insertion, newnode is right child of afterp. */ void @@ -1197,8 +1197,8 @@ avl_debug_end(avlnode_t *node) (struct avl_debug_node *)node->avl_size); } -avl_debug_node freenodes[100]; -avl_debug_node *freehead = &freenodes[0]; +avl_debug_node freenodes[100]; +avl_debug_node *freehead = &freenodes[0]; static avlnode_t * alloc_avl_debug_node() @@ -1226,15 +1226,15 @@ avl_print(avltree_desc_t *tree, avlnode_t *root, int depth) main() { - int i, j; - avlnode_t *np; + int i, j; + avlnode_t *np; avltree_desc_t tree; char linebuf[256], cmd[256]; avl_init_tree(&tree, &avl_debug_ops); for (i = 100; i > 0; i = i - 10) - { + { np = alloc__debug_avlnode(); ASSERT(np); np->avl_start = i; @@ -1289,7 +1289,7 @@ main() avl_insert(&tree, np); break; case 'r': { - avlnode_t *b, *e, *t; + avlnode_t *b, *e, *t; int checklen; printf("End of range ? "); @@ -1321,9 +1321,9 @@ main() #endif /* - * Given a tree, find value; will find return range enclosing value, + * Given a tree, find value; will find return range enclosing value, * or range immediately succeeding value, - * or range immediately preceeding value. + * or range immediately preceeding value. */ avlnode_t * avl_findadjacent( @@ -1331,7 +1331,7 @@ avl_findadjacent( register __psunsigned_t value, register int dir) { - register avlnode_t *np = tree->avl_root; + register avlnode_t *np = tree->avl_root; while (np) { if (value < AVL_START(tree, np)) { @@ -1368,7 +1368,7 @@ avl_findadjacent( continue; } /* if we were to add node with value, would - * have a growth of AVL_FORW; + * have a growth of AVL_FORW; */ if (dir == AVL_SUCCEED) { /* we are looking for a succeeding node; @@ -1379,7 +1379,7 @@ avl_findadjacent( if (dir == AVL_PRECEED) { /* looking for a preceeding node; this is it. */ return(np); - } + } ASSERT(dir == AVL_SUCCEED || dir == AVL_PRECEED); } /* AVL_START(tree, np) <= value < AVL_END(tree, np) */ @@ -1390,11 +1390,11 @@ avl_findadjacent( /* - * avl_findranges: + * avl_findranges: * * Given range r [start, end), find all ranges in tree which are contained * in r. At return, startp and endp point to first and last of - * a chain of elements which describe the contained ranges. Elements + * a chain of elements which describe the contained ranges. Elements * in startp ... endp are in sort order, and can be accessed by * using avl_nextino. */ @@ -1404,13 +1404,13 @@ avl_findranges( register avltree_desc_t *tree, register __psunsigned_t start, register __psunsigned_t end, - avlnode_t **startp, + avlnode_t **startp, avlnode_t **endp) { - register avlnode_t *np; + register avlnode_t *np; np = avl_findadjacent(tree, start, AVL_SUCCEED); - if (np == NULL /* nothing succeding start */ + if (np == NULL /* nothing succeding start */ || (np && (end <= AVL_START(tree, np)))) /* something follows start, but... is entirely after end */ diff --git a/repair/avl.h b/repair/avl.h index 2b6a98baf..81ceb88ee 100644 --- a/repair/avl.h +++ b/repair/avl.h @@ -1,33 +1,33 @@ /************************************************************************** * * * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ * * **************************************************************************/ @@ -36,8 +36,8 @@ typedef struct avlnode { - struct avlnode *avl_forw; /* pointer to right child (> parent) */ - struct avlnode *avl_back; /* pointer to left child (< parent) */ + struct avlnode *avl_forw; /* pointer to right child (> parent) */ + struct avlnode *avl_back; /* pointer to left child (< parent) */ struct avlnode *avl_parent; /* parent pointer */ struct avlnode *avl_nextino; /* next in-order; NULL terminated list*/ char avl_balance; /* tree balance */ @@ -54,7 +54,7 @@ typedef struct avlops { #define AVL_START(tree, n) (*(tree)->avl_ops->avl_start)(n) #define AVL_END(tree, n) (*(tree)->avl_ops->avl_end)(n) -/* +/* * tree descriptor: * root points to the root of the tree. * firstino points to the first in the ordered list. @@ -94,7 +94,7 @@ avl_insert_immediate( avltree_desc_t *tree, avlnode_t *afterp, avlnode_t *newnode); - + void avl_init_tree( avltree_desc_t *tree, @@ -129,7 +129,7 @@ avl_findranges( register avltree_desc_t *tree, register __psunsigned_t start, register __psunsigned_t end, - avlnode_t **startp, + avlnode_t **startp, avlnode_t **endp); #define AVL_PRECEED 0x1 diff --git a/repair/avl64.c b/repair/avl64.c index e6db97814..87a6d67b1 100644 --- a/repair/avl64.c +++ b/repair/avl64.c @@ -1,33 +1,33 @@ /************************************************************************** * * * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ * * **************************************************************************/ @@ -193,7 +193,7 @@ retreat( * np gets pushed down to lesser child's * avl_forw branch. * - * np-> -D +B + * np-> -D +B * / \ / \ * child-> B deleted A -D * / \ / @@ -241,7 +241,7 @@ retreat( * child's avl_forw node gets promoted up, along with * its avl_forw subtree * - * np-> -G C + * np-> -G C * / \ / \ * child-> +B H -B G * / \ \ / / \ @@ -290,7 +290,7 @@ retreat( * np gets pushed down to greater child's * avl_back branch. * - * np-> +B -D + * np-> +B -D * / \ / \ * deleted D <-child +B E * / \ \ @@ -433,19 +433,19 @@ avl64_delete( ASSERT(nnext->avl_nextino == np); nnext->avl_nextino = np->avl_nextino; /* - * Something preceeds np; np cannot be firstino. + * Something preceeds np; np cannot be firstino. */ ASSERT(tree->avl_firstino != np); } else { /* - * Nothing preceeding np; after deletion, np's nextino - * is firstino of tree. + * Nothing preceeding np; after deletion, np's nextino + * is firstino of tree. */ ASSERT(tree->avl_firstino == np); tree->avl_firstino = np->avl_nextino; } - + /* * Degenerate cases... @@ -499,7 +499,7 @@ attach: back->avl_forw = forw = np->avl_forw; forw->avl_parent = back; back->avl_parent = parent; - + if (parent) { if (parent->avl_forw == np) parent->avl_forw = back; @@ -531,7 +531,7 @@ attach: * / \ / \ * G J back-> G J (before retreat()) * / \ / \ - * F ?... F ?1 + * F ?... F ?1 * / \ * ? H <-forw * / @@ -544,7 +544,7 @@ attach: * Will be adjusted by retreat() below. */ forw->avl_balance = np->avl_balance; - + /* * forw inherits np's avl_forw... */ @@ -590,20 +590,20 @@ attach: /* - * avl_findanyrange: - * + * avl_findanyrange: + * * Given range r [start, end), find any range which is contained in r. * if checklen is non-zero, then only ranges of non-zero length are - * considered in finding a match. + * considered in finding a match. */ avl64node_t * avl64_findanyrange( register avl64tree_desc_t *tree, register __uint64_t start, register __uint64_t end, - int checklen) + int checklen) { - register avl64node_t *np = tree->avl_root; + register avl64node_t *np = tree->avl_root; /* np = avl64_findadjacent(tree, start, AVL_SUCCEED); */ while (np) { @@ -625,7 +625,7 @@ avl64_findanyrange( continue; } /* if we were to add node with start, would - * have a growth of AVL_FORW; + * have a growth of AVL_FORW; */ /* we are looking for a succeeding node; * this is nextino. @@ -648,7 +648,7 @@ avl64_findanyrange( return(np); } /* - * find non-zero length region + * find non-zero length region */ while (np && (AVL_END(tree, np) - AVL_START(tree, np) == 0) && (AVL_START(tree, np) < end)) @@ -810,7 +810,7 @@ avl64_balance( / \ / \ child-> +B F -B E / \ / / \ - A +C A D F + A +C A D F \ D @@ -925,9 +925,9 @@ static avl64node_t * avl64_insert_find_growth( register avl64tree_desc_t *tree, - register __uint64_t start, /* range start at start, */ - register __uint64_t end, /* exclusive */ - register int *growthp) /* OUT */ + register __uint64_t start, /* range start at start, */ + register __uint64_t end, /* exclusive */ + register int *growthp) /* OUT */ { avl64node_t *root = tree->avl_root; register avl64node_t *np; @@ -1082,7 +1082,7 @@ avl64_insert( /* * * avl64_insert_immediate(tree, afterp, newnode): - * insert newnode immediately into tree immediately after afterp. + * insert newnode immediately into tree immediately after afterp. * after insertion, newnode is right child of afterp. */ void @@ -1189,8 +1189,8 @@ avl64_debug_end(avl64node_t *node) (struct avl_debug_node *)node->avl_size); } -avl_debug_node freenodes[100]; -avl_debug_node *freehead = &freenodes[0]; +avl_debug_node freenodes[100]; +avl_debug_node *freehead = &freenodes[0]; static avl64node_t * alloc_avl64_debug_node() @@ -1218,15 +1218,15 @@ avl64_print(avl64tree_desc_t *tree, avl64node_t *root, int depth) main() { - int i, j; - avl64node_t *np; + int i, j; + avl64node_t *np; avl64tree_desc_t tree; char linebuf[256], cmd[256]; avl64_init_tree(&tree, &avl_debug_ops); for (i = 100; i > 0; i = i - 10) - { + { np = alloc__debug_avlnode(); ASSERT(np); np->avl_start = i; @@ -1281,7 +1281,7 @@ main() avl64_insert(&tree, np); break; case 'r': { - avl64node_t *b, *e, *t; + avl64node_t *b, *e, *t; int checklen; printf("End of range ? "); @@ -1313,9 +1313,9 @@ main() #endif /* - * Given a tree, find value; will find return range enclosing value, + * Given a tree, find value; will find return range enclosing value, * or range immediately succeeding value, - * or range immediately preceeding value. + * or range immediately preceeding value. */ avl64node_t * avl64_findadjacent( @@ -1323,7 +1323,7 @@ avl64_findadjacent( register __uint64_t value, register int dir) { - register avl64node_t *np = tree->avl_root; + register avl64node_t *np = tree->avl_root; while (np) { if (value < AVL_START(tree, np)) { @@ -1360,7 +1360,7 @@ avl64_findadjacent( continue; } /* if we were to add node with value, would - * have a growth of AVL_FORW; + * have a growth of AVL_FORW; */ if (dir == AVL_SUCCEED) { /* we are looking for a succeeding node; @@ -1371,7 +1371,7 @@ avl64_findadjacent( if (dir == AVL_PRECEED) { /* looking for a preceeding node; this is it. */ return(np); - } + } ASSERT(dir == AVL_SUCCEED || dir == AVL_PRECEED); } /* AVL_START(tree, np) <= value < AVL_END(tree, np) */ @@ -1382,11 +1382,11 @@ avl64_findadjacent( /* - * avl_findranges: + * avl_findranges: * * Given range r [start, end), find all ranges in tree which are contained * in r. At return, startp and endp point to first and last of - * a chain of elements which describe the contained ranges. Elements + * a chain of elements which describe the contained ranges. Elements * in startp ... endp are in sort order, and can be accessed by * using avl_nextino. */ @@ -1396,13 +1396,13 @@ avl64_findranges( register avl64tree_desc_t *tree, register __uint64_t start, register __uint64_t end, - avl64node_t **startp, + avl64node_t **startp, avl64node_t **endp) { - register avl64node_t *np; + register avl64node_t *np; np = avl64_findadjacent(tree, start, AVL_SUCCEED); - if (np == NULL /* nothing succeding start */ + if (np == NULL /* nothing succeding start */ || (np && (end <= AVL_START(tree, np)))) /* something follows start, but... is entirely after end */ diff --git a/repair/avl64.h b/repair/avl64.h index b0ba2c5c5..eab5020f0 100644 --- a/repair/avl64.h +++ b/repair/avl64.h @@ -1,33 +1,33 @@ /************************************************************************** * * * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ * * **************************************************************************/ @@ -37,8 +37,8 @@ #include typedef struct avl64node { - struct avl64node *avl_forw; /* pointer to right child (> parent) */ - struct avl64node *avl_back; /* pointer to left child (< parent) */ + struct avl64node *avl_forw; /* pointer to right child (> parent) */ + struct avl64node *avl_back; /* pointer to left child (< parent) */ struct avl64node *avl_parent; /* parent pointer */ struct avl64node *avl_nextino; /* next in-order; NULL terminated list*/ char avl_balance; /* tree balance */ @@ -61,7 +61,7 @@ typedef struct avl64ops { #define AVL_END(tree, n) (*(tree)->avl_ops->avl_end)(n) #endif -/* +/* * tree descriptor: * root points to the root of the tree. * firstino points to the first in the ordered list. @@ -96,7 +96,7 @@ avl64_insert_immediate( avl64tree_desc_t *tree, avl64node_t *afterp, avl64node_t *newnode); - + void avl64_init_tree( avl64tree_desc_t *tree, @@ -131,7 +131,7 @@ avl64_findranges( register avl64tree_desc_t *tree, register __uint64_t start, register __uint64_t end, - avl64node_t **startp, + avl64node_t **startp, avl64node_t **endp); /* diff --git a/repair/bmap.c b/repair/bmap.c index 0f60ef0cb..00c746e44 100644 --- a/repair/bmap.c +++ b/repair/bmap.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/repair/bmap.h b/repair/bmap.h index 5691653c8..ef449ba8b 100644 --- a/repair/bmap.h +++ b/repair/bmap.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/repair/dino_chunks.c b/repair/dino_chunks.c index 587233259..6325f4649 100644 --- a/repair/dino_chunks.c +++ b/repair/dino_chunks.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -54,8 +54,8 @@ check_aginode_block(xfs_mount_t *mp, { xfs_dinode_t *dino_p; - int i; - int cnt = 0; + int i; + int cnt = 0; xfs_buf_t *bp; /* @@ -88,7 +88,7 @@ int check_inode_block(xfs_mount_t *mp, xfs_ino_t ino) { - return(check_aginode_block(mp, XFS_INO_TO_AGNO(mp, ino), + return(check_aginode_block(mp, XFS_INO_TO_AGNO(mp, ino), XFS_INO_TO_AGBNO(mp, ino))); } @@ -131,8 +131,8 @@ verify_inode_chunk(xfs_mount_t *mp, int j; int state; - agno = XFS_INO_TO_AGNO(mp, ino); - agino = XFS_INO_TO_AGINO(mp, ino); + agno = XFS_INO_TO_AGNO(mp, ino); + agino = XFS_INO_TO_AGINO(mp, ino); agbno = XFS_INO_TO_AGBNO(mp, ino); *start_ino = NULLFSINO; diff --git a/repair/dinode.c b/repair/dinode.c index 47abc3b6d..a2740c227 100644 --- a/repair/dinode.c +++ b/repair/dinode.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -124,7 +124,7 @@ clear_dinode_attr(xfs_mount_t *mp, xfs_dinode_t *dino, xfs_ino_t ino_num) * (vs EXTENTS). Over various fixes, the aformat and forkoff have * been updated to not show an attribute fork at all, however. * It could be possible that resetting totsize/count are not needed, - * but just to be safe, leave it in for now. + * but just to be safe, leave it in for now. */ if (!no_modify) { @@ -697,7 +697,7 @@ process_bmbt_reclist_int( continue; } - + /* * regular file data fork or attribute fork */ @@ -723,15 +723,15 @@ process_bmbt_reclist_int( continue; } - /* FIX FOR BUG 653709 -- EKN + /* FIX FOR BUG 653709 -- EKN * realtime attribute fork, should be valid block number - * in regular data space, not realtime partion. + * in regular data space, not realtime partion. */ - if (type == XR_INO_RTDATA && whichfork == XFS_ATTR_FORK) { + if (type == XR_INO_RTDATA && whichfork == XFS_ATTR_FORK) { if (mp->m_sb.sb_agcount < XFS_FSB_TO_AGNO(mp, b)) return(1); - } - + } + state = get_fsbno_state(mp, b); switch (state) { case XR_E_FREE: @@ -836,7 +836,7 @@ get_agino_buf(xfs_mount_t *mp, if ((irec = find_inode_rec(agno, agino)) == NULL) return(NULL); - + size = XFS_FSB_TO_BB(mp, MAX(1, XFS_INODES_PER_CHUNK/inodes_per_block)); bp = libxfs_readbuf(mp->m_dev, XFS_AGB_TO_DADDR(mp, agno, XFS_AGINO_TO_AGBNO(mp, irec->ino_startnum)), size, 0); @@ -1085,7 +1085,7 @@ get_bmapi(xfs_mount_t *mp, xfs_dinode_t *dino_p, fsbno = getfunc_extlist(mp, ino_num, dino_p, bno, whichfork); break; case XFS_DINODE_FMT_BTREE: - fsbno = getfunc_btree(mp, ino_num, dino_p, bno, whichfork); + fsbno = getfunc_btree(mp, ino_num, dino_p, bno, whichfork); break; case XFS_DINODE_FMT_LOCAL: do_error(_("get_bmapi() called for local inode %llu\n"), @@ -1284,7 +1284,7 @@ process_btinode( cursor.level[0].fsbno); return(1); } - + return(0); } @@ -1428,7 +1428,7 @@ process_symlink_extlist(xfs_mount_t *mp, xfs_ino_t lino, xfs_dinode_t *dino) /* * the max # of extents in a symlink inode is equal to the - * number of max # of blocks required to store the symlink + * number of max # of blocks required to store the symlink */ if (numrecs > max_symlink_blocks) { do_warn( @@ -1658,7 +1658,7 @@ process_misc_ino_types_blocks(xfs_drfsbno_t totblocks, xfs_ino_t lino, int type) * you can not enforce all misc types have zero data fork blocks * by checking dino->di_core.di_nblocks because atotblocks (attribute * blocks) are part of nblocks. We must check this later when atotblocks - * has been calculated or by doing a simple check that anExtents == 0. + * has been calculated or by doing a simple check that anExtents == 0. * We must also guarantee that totblocks is 0. Thus nblocks checking * will be done later in process_dinode_int for misc types. */ @@ -1898,7 +1898,7 @@ process_dinode_int(xfs_mount_t *mp, * because of the lack of any write ordering guarantee, it's * possible that the core got updated but the forks didn't. * so rather than be ambitious (and probably incorrect), - * if there's an inconsistency, we get conservative and + * if there's an inconsistency, we get conservative and * just pitch the file. blow off checking formats of * free inodes since technically any format is legal * as we reset the inode when we re-use it. @@ -2515,7 +2515,7 @@ _("mismatch between format (%d) and size (%lld) in directory ino %llu\n"), blkmap_free(ablkmap); } return(1); - + } else if (check_dups) { switch (dinoc->di_aformat) { case XFS_DINODE_FMT_LOCAL: @@ -2574,7 +2574,7 @@ _("mismatch between format (%d) and size (%lld) in directory ino %llu\n"), _("would clear attr fork\n")); } atotblocks = 0; - anextents = 0; + anextents = 0; } else { *dirty = 1; /* it's been repaired */ @@ -2586,8 +2586,8 @@ _("mismatch between format (%d) and size (%lld) in directory ino %llu\n"), } else anextents = 0; - /* - * enforce totblocks is 0 for misc types + /* + * enforce totblocks is 0 for misc types */ if (process_misc_ino_types_blocks(totblocks, lino, type)) { if (!no_modify) { diff --git a/repair/dinode.h b/repair/dinode.h index dc261807e..15548ab18 100644 --- a/repair/dinode.h +++ b/repair/dinode.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef _XR_DINODE_H @@ -51,7 +51,7 @@ convert_extent( xfs_dfilblks_t *cp, /* blockcount */ int *fp); /* extent flag */ -int +int process_bmbt_reclist(xfs_mount_t *mp, xfs_bmbt_rec_32_t *rp, int numrecs, @@ -150,6 +150,6 @@ get_bmapi(xfs_mount_t *mp, xfs_dinode_t *dip, xfs_ino_t ino_num, xfs_dfiloff_t bno, - int whichfork ); + int whichfork ); #endif /* _XR_DINODE_H */ diff --git a/repair/dir.c b/repair/dir.c index d3d41f359..831d09e6a 100644 --- a/repair/dir.c +++ b/repair/dir.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -597,7 +597,7 @@ verify_da_freemap(xfs_mount_t *mp, da_freemap_t *map, da_hole_map_t *holes, for (i = 0; i < XFS_DIR_LEAF_MAPSIZE; i++) { if (holes->hentries[i].size == 0) continue; - + start = holes->hentries[i].base; len = holes->hentries[i].size; @@ -743,7 +743,7 @@ compare_da_freemaps(xfs_mount_t *mp, da_hole_map_t *holemap, if (holemap->hentries[i].base == block_hmap->hentries[k].base && holemap->hentries[i].size == - block_hmap->hentries[k].size) + block_hmap->hentries[k].size) found = 1; } if (!found) { @@ -794,7 +794,7 @@ int traverse_int_dablock(xfs_mount_t *mp, da_bt_cursor_t *da_cursor, xfs_dablk_t *rbno, - int whichfork) + int whichfork) { xfs_dablk_t bno; int i; @@ -864,7 +864,7 @@ traverse_int_dablock(xfs_mount_t *mp, if (INT_GET(node->hdr.level, ARCH_CONVERT) == i - 1) { i--; } else { - if (whichfork == XFS_DATA_FORK) + if (whichfork == XFS_DATA_FORK) do_warn(_("bad directory btree for " "directory inode %llu\n"), da_cursor->ino); @@ -997,7 +997,7 @@ get_first_dblock_fsbno(xfs_mount_t *mp, * walk down left side of btree, release buffers as you * go. if the root block is a leaf (single-level btree), * just return it. - * + * */ bp = libxfs_readbuf(mp->m_dev, XFS_FSB_TO_DADDR(mp, fsbno), @@ -1250,7 +1250,7 @@ verify_da_path(xfs_mount_t *mp, * validating it. bno value should be ok since * it was set when the block was first read in. */ - cursor->level[this_level].hashval = + cursor->level[this_level].hashval = INT_GET(node->btree[entry - 1].hashval, ARCH_CONVERT); /* @@ -1723,7 +1723,7 @@ process_leaf_dir_block( xfs_mount_t *mp, xfs_dir_leafblock_t *leaf, xfs_dablk_t da_bno, - xfs_ino_t ino, + xfs_ino_t ino, xfs_dahash_t last_hashval, /* last hashval encountered */ int ino_discovery, blkmap_t *blkmap, @@ -2208,7 +2208,7 @@ _("illegal name \"%s\" in directory inode %llu, entry would be cleared\n"), ino); } } - + /* * now we can mark entries with NULLFSINO's bad */ @@ -2532,7 +2532,7 @@ _("- existing hole info for block %d, dir inode %llu (base, size) - \n"), for (i = 0; i < XFS_DIR_LEAF_MAPSIZE; i++) { do_warn( "- (%d, %d) ", bholemap.hentries[i].base, - bholemap.hentries[i].size); + bholemap.hentries[i].size); } do_warn(_("- holes flag = %d\n"), bholemap.lost_holes); } @@ -2915,7 +2915,7 @@ process_node_dir( if (INT_GET(dip->di_core.di_size, ARCH_CONVERT) < (da_cursor.greatest_bno + 1) * mp->m_sb.sb_blocksize) { if ((xfs_fsize_t) (da_cursor.greatest_bno - * mp->m_sb.sb_blocksize) > UINT_MAX) { + * mp->m_sb.sb_blocksize) > UINT_MAX) { do_warn( _("out of range internal directory block numbers (inode %llu)\n"), ino); @@ -3113,7 +3113,7 @@ process_dir( do_warn(_("no .. entry for root directory %llu\n"), ino); need_root_dotdot = 1; } - + #ifdef XR_DIR_TRACE fprintf(stderr, "(process_dir), parent of %llu is %llu\n", ino, parent); #endif diff --git a/repair/dir.h b/repair/dir.h index 5add037da..9b662f78b 100644 --- a/repair/dir.h +++ b/repair/dir.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -101,8 +101,8 @@ init_da_freemap( int namecheck( - char *name, - int length); + char *name, + int length); int process_shortform_dir( @@ -142,7 +142,7 @@ traverse_int_dablock( xfs_mount_t *mp, da_bt_cursor_t *da_cursor, xfs_dablk_t *rbno, - int whichfork); + int whichfork); int verify_da_path( diff --git a/repair/dir2.c b/repair/dir2.c index 2c45888ee..b2629d9e2 100644 --- a/repair/dir2.c +++ b/repair/dir2.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -42,7 +42,7 @@ /* * Tag bad directory entries with this. - * We can't tag them with -1 since that will look like a + * We can't tag them with -1 since that will look like a * data_unused_t instead of a data_entry_t. */ #define BADFSINO ((xfs_ino_t)0xfeffffffffffffffULL) @@ -610,7 +610,7 @@ verify_dir2_path(xfs_mount_t *mp, * validating it. bno value should be ok since * it was set when the block was first read in. */ - cursor->level[this_level].hashval = + cursor->level[this_level].hashval = INT_GET(node->btree[entry - 1].hashval, ARCH_CONVERT); /* @@ -872,7 +872,7 @@ process_sf_dir2( i8 = (XFS_DIR2_SF_GET_INUMBER_ARCH(sfp, &sfp->hdr.parent, ARCH_CONVERT) > XFS_DIR2_MAX_SHORT_INUM); - /* + /* * check for bad entry count */ if (num_entries * XFS_DIR2_SF_ENTSIZE_BYNAME(sfp, 1) + @@ -1796,7 +1796,7 @@ process_leaf_level_dir2( xfs_mount_t *mp, dir2_bt_cursor_t *da_cursor, int *repair) -{ +{ bmap_ext_t *bmp; xfs_dabuf_t *bp; int buf_dirty; @@ -1962,7 +1962,7 @@ process_node_dir2( } else { /* * Now pass cursor and bno into leaf-block processing routine. - * The leaf dir level routine checks the interior paths up to + * The leaf dir level routine checks the interior paths up to * the root including the final right-most path. */ return process_leaf_level_dir2(mp, &da_cursor, repair); @@ -2123,7 +2123,7 @@ process_dir2( do_warn(_("no .. entry for root directory %llu\n"), ino); need_root_dotdot = 1; } - + ASSERT((ino != mp->m_sb.sb_rootino && ino != *parent) || (ino == mp->m_sb.sb_rootino && (ino == *parent || need_root_dotdot == 1))); diff --git a/repair/dir2.h b/repair/dir2.h index b5e45fd53..c780c2c89 100644 --- a/repair/dir2.h +++ b/repair/dir2.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/repair/dir_stack.c b/repair/dir_stack.c index 41be4a529..622c21dc9 100644 --- a/repair/dir_stack.c +++ b/repair/dir_stack.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/repair/dir_stack.h b/repair/dir_stack.h index e0412c958..0ae537745 100644 --- a/repair/dir_stack.h +++ b/repair/dir_stack.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/repair/err_protos.h b/repair/err_protos.h index f69e15249..76fdff4f6 100644 --- a/repair/err_protos.h +++ b/repair/err_protos.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/repair/globals.c b/repair/globals.c index bf4bf2a5b..08c7d8124 100644 --- a/repair/globals.c +++ b/repair/globals.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -34,4 +34,3 @@ #define EXTERN #include "globals.h" - diff --git a/repair/globals.h b/repair/globals.h index 8d78d6c0b..35fe62d6d 100644 --- a/repair/globals.h +++ b/repair/globals.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/repair/incore.c b/repair/incore.c index d376cb358..8a2a20bbe 100644 --- a/repair/incore.c +++ b/repair/incore.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -73,16 +73,16 @@ setup_bmap(xfs_agnumber_t agno, xfs_agblock_t numblocks, xfs_drtbno_t rtblocks) int i; size_t size = 0; - ba_bmap = (__uint64_t**)malloc(agno*sizeof(__uint64_t *)); - if (!ba_bmap) { + ba_bmap = (__uint64_t**)malloc(agno*sizeof(__uint64_t *)); + if (!ba_bmap) { do_error(_("couldn't allocate block map pointers\n")); return; } for (i = 0; i < agno; i++) { - size = roundup(numblocks / (NBBY/XR_BB),sizeof(__uint64_t)); - - ba_bmap[i] = (__uint64_t*)memalign(sizeof(__uint64_t), size); - if (!ba_bmap[i]) { + size = roundup(numblocks / (NBBY/XR_BB),sizeof(__uint64_t)); + + ba_bmap[i] = (__uint64_t*)memalign(sizeof(__uint64_t), size); + if (!ba_bmap[i]) { do_error(_("couldn't allocate block map, size = %d\n"), numblocks); return; @@ -97,7 +97,7 @@ setup_bmap(xfs_agnumber_t agno, xfs_agblock_t numblocks, xfs_drtbno_t rtblocks) size = roundup(rtblocks / (NBBY/XR_BB), sizeof(__uint64_t)); - rt_ba_bmap=(__uint64_t*)memalign(sizeof(__uint64_t), size); + rt_ba_bmap=(__uint64_t*)memalign(sizeof(__uint64_t), size); if (!rt_ba_bmap) { do_error( _("couldn't allocate realtime block map, size = %llu\n"), @@ -179,7 +179,7 @@ set_bmap_rt(xfs_drtbno_t num) for (j = 0; j < size; j++) rt_ba_bmap[j] = 0x2222222222222222LL; - + return; } diff --git a/repair/incore.h b/repair/incore.h index d3c6ccd0c..15a45f49e 100644 --- a/repair/incore.h +++ b/repair/incore.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/repair/incore_bmc.c b/repair/incore_bmc.c index 608950226..efab88273 100644 --- a/repair/incore_bmc.c +++ b/repair/incore_bmc.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/repair/incore_ext.c b/repair/incore_ext.c index 09b0ad463..14e370fc4 100644 --- a/repair/incore_ext.c +++ b/repair/incore_ext.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -440,7 +440,7 @@ get_bcnt_extent(xfs_agnumber_t agno, xfs_agblock_t startblock, if ((ext = (extent_tree_node_t *) avl_find(extent_bcnt_ptrs[agno], blockcount)) == NULL) return(NULL); - + top = ext; if (ext->next != NULL) { @@ -463,7 +463,7 @@ get_bcnt_extent(xfs_agnumber_t agno, xfs_agblock_t startblock, * is the head of the list so pulling * the item out of the list and hence * the avl tree would be a bad idea. - * + * * (cheaper than the alternative, a tree * delete of this node followed by a tree * insert of the next node on the list). @@ -555,7 +555,7 @@ add_dup_extent(xfs_agnumber_t agno, xfs_agblock_t startblock, /* * just bail if the new extent is contained within an old one */ - if (ext->ex_startblock <= startblock && + if (ext->ex_startblock <= startblock && ext->ex_blockcount >= blockcount) return; /* @@ -806,7 +806,7 @@ add_rt_dup_extent(xfs_drtbno_t startblock, xfs_extlen_t blockcount) /* * just bail if the new extent is contained within an old one */ - if (ext->rt_startblock <= startblock && + if (ext->rt_startblock <= startblock && ext->rt_blockcount >= blockcount) return; /* diff --git a/repair/incore_ino.c b/repair/incore_ino.c index eeeb4b504..a808a99ba 100644 --- a/repair/incore_ino.c +++ b/repair/incore_ino.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -472,16 +472,16 @@ set_inode_parent(ino_tree_node_t *irec, int offset, xfs_ino_t parent) ASSERT(full_backptrs == 0); if (irec->ino_un.plist == NULL) { - irec->ino_un.plist = - (parent_list_t*)malloc(sizeof(parent_list_t)); - if (!irec->ino_un.plist) + irec->ino_un.plist = + (parent_list_t*)malloc(sizeof(parent_list_t)); + if (!irec->ino_un.plist) do_error(_("couldn't malloc parent list table\n")); - + irec->ino_un.plist->pmask = 1LL << offset; - irec->ino_un.plist->pentries = - (xfs_ino_t*)memalign(sizeof(xfs_ino_t), sizeof(xfs_ino_t)); - if (!irec->ino_un.plist->pentries) - do_error(_("couldn't memalign pentries table\n")); + irec->ino_un.plist->pentries = + (xfs_ino_t*)memalign(sizeof(xfs_ino_t), sizeof(xfs_ino_t)); + if (!irec->ino_un.plist->pentries) + do_error(_("couldn't memalign pentries table\n")); #ifdef DEBUG irec->ino_un.plist->cnt = 1; #endif @@ -526,8 +526,8 @@ set_inode_parent(ino_tree_node_t *irec, int offset, xfs_ino_t parent) ASSERT(cnt >= target); tmp = (xfs_ino_t*)memalign(sizeof(xfs_ino_t), (cnt + 1) * sizeof(xfs_ino_t)); - if (!tmp) - do_error(_("couldn't memalign pentries table\n")); + if (!tmp) + do_error(_("couldn't memalign pentries table\n")); (void) bcopy(irec->ino_un.plist->pentries, tmp, target * sizeof(parent_entry_t)); @@ -701,7 +701,7 @@ get_backptr(void) if ((ptr = malloc(sizeof(backptrs_t))) == NULL) do_error(_("could not malloc back pointer table\n")); - + bzero(ptr, sizeof(backptrs_t)); return(ptr); @@ -723,7 +723,7 @@ add_ino_backptrs(xfs_mount_t *mp) while (ino_rec != NULL) { tmp = ino_rec->ino_un.plist; - ino_rec->ino_un.backptrs = get_backptr(); + ino_rec->ino_un.backptrs = get_backptr(); ino_rec->ino_un.backptrs->parents = tmp; #ifdef XR_BCKPTR_DBG diff --git a/repair/init.c b/repair/init.c index 713b43617..7570a07e2 100644 --- a/repair/init.c +++ b/repair/init.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/repair/io.c b/repair/io.c index a9d004203..2adb4578b 100644 --- a/repair/io.c +++ b/repair/io.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/repair/phase1.c b/repair/phase1.c index 1853d0f77..c24d4c1af 100644 --- a/repair/phase1.c +++ b/repair/phase1.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -47,10 +47,10 @@ no_sb(void) char * alloc_ag_buf(int size) { - char *bp; + char *bp; - bp = (char *)memalign(MEM_ALIGN, size); - if (!bp) + bp = (char *)memalign(MEM_ALIGN, size); + if (!bp) do_error(_("could not allocate ag header buffer (%d bytes)\n"), size); return(bp); @@ -107,7 +107,7 @@ phase1(xfs_mount_t *mp) no_sb(); primary_sb_modified = 1; } - + if (primary_sb_modified) { if (!no_modify) { do_warn(_("writing modified primary superblock\n")); diff --git a/repair/phase2.c b/repair/phase2.c index 5e4dd84e4..08963eb14 100644 --- a/repair/phase2.c +++ b/repair/phase2.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -91,7 +91,7 @@ zero_log(xfs_mount_t *mp) } } - libxfs_log_clear(logdev, + libxfs_log_clear(logdev, XFS_FSB_TO_DADDR(mp, mp->m_sb.sb_logstart), (xfs_extlen_t)XFS_FSB_TO_BB(mp, mp->m_sb.sb_logblocks), &mp->m_sb.sb_uuid, @@ -124,7 +124,7 @@ phase2(xfs_mount_t *mp) if (!x.logname) do_error(_("This filesystem has an external log. " "Specify log device with the -l option.\n")); - + do_log(_("Phase 2 - using external log on %s\n"), x.logname); } else do_log(_("Phase 2 - using internal log\n")); diff --git a/repair/phase3.c b/repair/phase3.c index 508c2e30a..45378734f 100644 --- a/repair/phase3.c +++ b/repair/phase3.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -187,7 +187,7 @@ phase3(xfs_mount_t *mp) for (i = 0; i < mp->m_sb.sb_agcount; i++) { do_log(_(" - agno = %d\n"), i); /* - * turn on directory processing (inode discovery) and + * turn on directory processing (inode discovery) and * attribute processing (extra_attr_check) */ process_aginodes(mp, i, 1, 0, 1); diff --git a/repair/phase4.c b/repair/phase4.c index fc1c7e187..2250a4ff2 100644 --- a/repair/phase4.c +++ b/repair/phase4.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -181,7 +181,7 @@ lf_block_delete_orphanage(xfs_mount_t *mp, if (ino_dirty) *rbuf_dirty = 1; } - + if (inode_isadir(irec, ino_offset)) clear_inode_isadir(irec, ino_offset); @@ -648,7 +648,7 @@ lf2_block_delete_orphanage(xfs_mount_t *mp, if (ino_dirty) *rbuf_dirty = 1; } - + if (inode_isadir(irec, ino_offset)) clear_inode_isadir(irec, ino_offset); @@ -916,7 +916,7 @@ shortform2_delete_orphanage(xfs_mount_t *mp, else libxfs_putbuf(bp); } - + if (inode_isadir(irec, ino_offset)) clear_inode_isadir(irec, ino_offset); @@ -1147,7 +1147,7 @@ phase4(xfs_mount_t *mp) int bstate; int count_bcnt_extents(xfs_agnumber_t agno); int count_bno_extents(xfs_agnumber_t agno); - + ag_hdr_block = howmany(ag_hdr_len, mp->m_sb.sb_blocksize); do_log(_("Phase 4 - check for duplicate blocks...\n")); @@ -1321,7 +1321,7 @@ phase4(xfs_mount_t *mp) * duplicate extent. if so, the inode is cleared and second * pass is skipped. second pass sets the block bitmap * for all blocks claimed by the inode. directory - * and attribute processing is turned OFF since we did that + * and attribute processing is turned OFF since we did that * already in phase 3. */ do_log(_(" - agno = %d\n"), i); diff --git a/repair/phase5.c b/repair/phase5.c index 9c666ea0d..cbb53c80f 100644 --- a/repair/phase5.c +++ b/repair/phase5.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -771,7 +771,7 @@ build_freespace_tree(xfs_mount_t *mp, xfs_agnumber_t agno, */ if (magic == XFS_ABTB_MAGIC) ext_ptr = findfirst_bno_extent(agno); - else + else ext_ptr = findfirst_bcnt_extent(agno); #ifdef XR_BLD_FREE_TRACE @@ -1394,7 +1394,7 @@ sync_sb(xfs_mount_t *mp) update_sb_version(mp); *sbp = mp->m_sb; - libxfs_xlate_sb(XFS_BUF_PTR(bp), sbp, -1, ARCH_CONVERT, + libxfs_xlate_sb(XFS_BUF_PTR(bp), sbp, -1, ARCH_CONVERT, XFS_SB_ALL_BITS); libxfs_writebuf(bp, 0); } diff --git a/repair/phase6.c b/repair/phase6.c index 3f224efc5..53d90cae7 100644 --- a/repair/phase6.c +++ b/repair/phase6.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -464,7 +464,7 @@ fill_rbmino(xfs_mount_t *mp) error = libxfs_trans_read_buf( mp, tp, mp->m_dev, - XFS_FSB_TO_DADDR(mp, map.br_startblock), + XFS_FSB_TO_DADDR(mp, map.br_startblock), XFS_FSB_TO_BB(mp, 1), 1, &bp); if (error) { @@ -534,7 +534,7 @@ fill_rsumino(xfs_mount_t *mp) error = libxfs_trans_read_buf( mp, tp, mp->m_dev, - XFS_FSB_TO_DADDR(mp, map.br_startblock), + XFS_FSB_TO_DADDR(mp, map.br_startblock), XFS_FSB_TO_BB(mp, 1), 1, &bp); if (error) { @@ -782,7 +782,7 @@ mk_orphanage(xfs_mount_t *mp) } else orphanage_entered = 1; - /* + /* * bump up the link count in the root directory to account * for .. in the new directory */ @@ -1041,7 +1041,7 @@ _("can't map block %d in %s inode %llu, xfs_bmapi returns %d, nmap = %d\n"), * walk down left side of btree, release buffers as you * go. if the root block is a leaf (single-level btree), * just return it. - * + * */ bp = libxfs_readbuf(mp->m_dev, XFS_FSB_TO_DADDR(mp, fsbno), @@ -1409,7 +1409,7 @@ lf_block_dir_entry_check(xfs_mount_t *mp, */ irec = find_inode_rec(XFS_INO_TO_AGNO(mp, lino), XFS_INO_TO_AGINO(mp, lino)); - + if (irec == NULL) { nbad++; do_warn( @@ -1790,7 +1790,7 @@ longform_dir2_entry_check_data( /* check for invalid tag */ if (INT_GET(*XFS_DIR2_DATA_UNUSED_TAG_P_ARCH( - dup, ARCH_CONVERT), ARCH_CONVERT) != + dup, ARCH_CONVERT), ARCH_CONVERT) != (char *)dup - (char *)d) break; @@ -2557,7 +2557,7 @@ longform_dir2_rebuild_data( /* * Finish the rebuild of a directory. - * Stuff / in and then remove it, this forces the directory to end + * Stuff / in and then remove it, this forces the directory to end * up in the right format. */ void @@ -2806,7 +2806,7 @@ shortform_dir_entry_check(xfs_mount_t *mp, * no need to worry about '.' since it doesn't exist. */ sf_entry = next_sfe = &sf->list[0]; - if (sf == NULL) { + if (sf == NULL) { junkit = 1; do_warn(_("shortform dir inode %llu has null data entries \n"), ino); @@ -3851,7 +3851,7 @@ mark_standalone_inodes(xfs_mount_t *mp) irec = find_inode_rec(XFS_INO_TO_AGNO(mp, mp->m_sb.sb_rsumino), XFS_INO_TO_AGINO(mp, mp->m_sb.sb_rsumino)); - offset = XFS_INO_TO_AGINO(mp, mp->m_sb.sb_rsumino) - + offset = XFS_INO_TO_AGINO(mp, mp->m_sb.sb_rsumino) - irec->ino_startnum; ASSERT(irec != NULL); diff --git a/repair/phase7.c b/repair/phase7.c index 085a85c32..4f3b52ad3 100644 --- a/repair/phase7.c +++ b/repair/phase7.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -149,7 +149,7 @@ phase7(xfs_mount_t *mp) if (ino != orphanage_ino) set_nlinks(&ip->i_d, ino, nrefs, &dirty); - + if (!dirty) { libxfs_trans_iput(tp, ip, 0); } else { @@ -181,7 +181,7 @@ phase7(xfs_mount_t *mp) } } - /* + /* * always have one unfinished transaction coming out * of the loop. cancel it. */ diff --git a/repair/protos.h b/repair/protos.h index baeb02fc8..374d3878a 100644 --- a/repair/protos.h +++ b/repair/protos.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -56,4 +56,3 @@ char *alloc_ag_buf(int size); void print_inode_list(xfs_agnumber_t i); char * err_string(int err_code); - diff --git a/repair/rt.c b/repair/rt.c index 719132752..851446232 100644 --- a/repair/rt.c +++ b/repair/rt.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -47,7 +47,7 @@ rtinit(xfs_mount_t *mp) { if (mp->m_sb.sb_rblocks == 0) return; - + /* * realtime init -- blockmap initialization is * handled by incore_init() diff --git a/repair/rt.h b/repair/rt.h index 77087f297..646309add 100644 --- a/repair/rt.h +++ b/repair/rt.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/repair/sb.c b/repair/sb.c index a2b4ecabb..798876fc7 100644 --- a/repair/sb.c +++ b/repair/sb.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -237,7 +237,7 @@ verify_sb(xfs_sb_t *sb, int is_primary_sb) __uint32_t bsize; xfs_extlen_t align; int i; - + /* check magic number and version number */ if (sb->sb_magicnum != XFS_SB_MAGIC) @@ -355,8 +355,8 @@ verify_sb(xfs_sb_t *sb, int is_primary_sb) * verify stripe alignment fields if present */ if (XFS_SB_VERSION_HASDALIGN(sb)) { - if ((!sb->sb_unit && sb->sb_width) || - (sb->sb_unit && sb->sb_agblocks % sb->sb_unit)) + if ((!sb->sb_unit && sb->sb_width) || + (sb->sb_unit && sb->sb_agblocks % sb->sb_unit)) return(XR_BAD_SB_UNIT); if ((sb->sb_unit && !sb->sb_width) || (sb->sb_width && sb->sb_unit && sb->sb_width % sb->sb_unit)) @@ -424,29 +424,29 @@ verify_sb(xfs_sb_t *sb, int is_primary_sb) void write_primary_sb(xfs_sb_t *sbp, int size) { - void *buf; - + void *buf; + if (no_modify) return; - - if ((buf = calloc(size, 1)) == NULL) { + + if ((buf = calloc(size, 1)) == NULL) { do_error(_("failed to malloc superblock buffer\n")); - return; + return; } if (lseek64(fs_fd, 0LL, SEEK_SET) != 0LL) { - free(buf); + free(buf); do_error(_("couldn't seek to offset 0 in filesystem\n")); - } - + } + libxfs_xlate_sb(buf, sbp, -1, ARCH_CONVERT, XFS_SB_ALL_BITS); if (write(fs_fd, buf, size) != size) { - free(buf); + free(buf); do_error(_("primary superblock write failed!\n")); - } + } - free(buf); + free(buf); } /* @@ -456,9 +456,9 @@ int get_sb(xfs_sb_t *sbp, xfs_off_t off, int size, xfs_agnumber_t agno) { int error, rval; - void *buf; - - if ((buf = calloc(size, 1)) == NULL) { + void *buf; + + if ((buf = calloc(size, 1)) == NULL) { do_error( _("error reading superblock %u -- failed to malloc buffer\n"), agno, off); @@ -539,7 +539,7 @@ fs_geo_list_t * add_geo(fs_geo_list_t *list, fs_geometry_t *geo_p, int index) { fs_geo_list_t *current = list; - + while (current != NULL) { if (memcmp(geo_p, ¤t->geo, sizeof(fs_geometry_t)) == 0) { current->refs++; @@ -798,7 +798,7 @@ verify_set_primary_sb(xfs_sb_t *rsb, if (current->index != sb_index) { *sb_modified = 1; - off = current->index * current->geo.sb_agblocks + off = current->index * current->geo.sb_agblocks * current->geo.sb_blocksize; if (get_sb(sb, off, current->geo.sb_sectsize, current->index) != XR_OK) diff --git a/repair/scan.c b/repair/scan.c index 6fb757e40..5e8d01d25 100644 --- a/repair/scan.c +++ b/repair/scan.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -174,7 +174,7 @@ scanfunc_bmap( forkname = _("attr"); /* - * unlike the ag freeblock btrees, if anything looks wrong + * unlike the ag freeblock btrees, if anything looks wrong * in an inode bmap tree, just bail. it's possible that * we'll miss a case where the to-be-toasted inode and * another inode are claiming the same block but that's @@ -451,7 +451,7 @@ _("out-of-order bmap key (file offset) in inode %llu, %s fork, fsbno %llu\n"), * Check that the last child block's forward sibling pointer * is NULL. */ - if (check_dups == 0 && + if (check_dups == 0 && bm_cursor->level[level - 1].right_fsbno != NULLDFSBNO) { do_warn( _("bad fwd (right) sibling pointer (saw %llu should be NULLDFSBNO)\n" @@ -620,7 +620,7 @@ _("bno freespace btree block claimed (state %d), agno %d, bno %d, suspect %d\n") * If either of the entries references a different block, * check the sibling pointer. If there's a sibling * pointer mismatch, try and extract as much data - * as possible. + * as possible. */ if (INT_GET(pp[i], ARCH_CONVERT) != 0 && verify_agbno(mp, agno, INT_GET(pp[i], ARCH_CONVERT))) @@ -1195,7 +1195,7 @@ scan_ag( do_error(_("can't allocate memory for superblock\n")); libxfs_putbuf(sbbuf); return; - } + } libxfs_xlate_sb(XFS_BUF_TO_SBP(sbbuf), sb, 1, ARCH_CONVERT, XFS_SB_ALL_BITS); @@ -1205,7 +1205,7 @@ scan_ag( if (!agfbuf) { do_error(_("can't read agf block for ag %d\n"), agno); libxfs_putbuf(sbbuf); - free(sb); + free(sb); return; } agf = XFS_BUF_TO_AGF(agfbuf); @@ -1217,7 +1217,7 @@ scan_ag( do_error(_("can't read agi block for ag %d\n"), agno); libxfs_putbuf(agfbuf); libxfs_putbuf(sbbuf); - free(sb); + free(sb); return; } agi = XFS_BUF_TO_AGI(agibuf); @@ -1265,7 +1265,7 @@ scan_ag( libxfs_putbuf(agibuf); libxfs_putbuf(agfbuf); libxfs_putbuf(sbbuf); - free(sb); + free(sb); do_warn(_("bad uncorrected agheader %d, skipping ag...\n"), agno); @@ -1329,7 +1329,7 @@ scan_ag( libxfs_xlate_sb(XFS_BUF_PTR(sbbuf), sb, -1, ARCH_CONVERT, XFS_SB_ALL_BITS); libxfs_writebuf(sbbuf, 0); - } else + } else libxfs_putbuf(sbbuf); - free(sb); + free(sb); } diff --git a/repair/scan.h b/repair/scan.h index fdc6ef612..b3a892eb1 100644 --- a/repair/scan.h +++ b/repair/scan.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ #ifndef _XR_SCAN_H diff --git a/repair/versions.c b/repair/versions.c index d21923d93..a7db36fb2 100644 --- a/repair/versions.c +++ b/repair/versions.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -111,7 +111,7 @@ update_sb_version(xfs_mount_t *mp) if (!(vn & XFS_SB_VERSION_ALLFBITS)) vn = XFS_SB_VERSION_TOOLD(vn); - + ASSERT(vn != 0); sb->sb_versionnum = vn; } diff --git a/repair/versions.h b/repair/versions.h index e87c6b8ca..2187c1c54 100644 --- a/repair/versions.h +++ b/repair/versions.h @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c index 3fcb9a4d3..d36443620 100644 --- a/repair/xfs_repair.c +++ b/repair/xfs_repair.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -339,7 +339,7 @@ calc_mkfs(xfs_mount_t *mp) if (XFS_SB_VERSION_HASDALIGN(&mp->m_sb) && do_inoalign) { first_prealloc_ino = XFS_OFFBNO_TO_AGINO(mp, roundup(fino_bno, mp->m_sb.sb_unit), 0); - } else if (XFS_SB_VERSION_HASALIGN(&mp->m_sb) && + } else if (XFS_SB_VERSION_HASALIGN(&mp->m_sb) && mp->m_sb.sb_inoalignmt > 1) { first_prealloc_ino = XFS_OFFBNO_TO_AGINO(mp, roundup(fino_bno, @@ -596,7 +596,7 @@ _("Note - stripe unit (%d) and width (%d) fields have been reset.\n" sb->sb_unit, sb->sb_width); sb->sb_unit = 0; sb->sb_width = 0; - } + } libxfs_writebuf(sbp, 0); diff --git a/rtcp/Makefile b/rtcp/Makefile index 9a563f3d6..9dc45873b 100644 --- a/rtcp/Makefile +++ b/rtcp/Makefile @@ -1,32 +1,32 @@ # # Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. -# +# # This program is distributed in the hope that it would be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# +# # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement # or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston MA 02111-1307, USA. -# +# # Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, # Mountain View, CA 94043, or: -# -# http://www.sgi.com -# -# For further information regarding this notice, see: -# +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ # diff --git a/rtcp/xfs_rtcp.c b/rtcp/xfs_rtcp.c index e739d95d5..c7966b744 100644 --- a/rtcp/xfs_rtcp.c +++ b/rtcp/xfs_rtcp.c @@ -1,32 +1,32 @@ /* * Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston MA 02111-1307, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -129,7 +129,7 @@ rtcp( char *source, char *target, int fextsize) { int fromfd, tofd, readct, writect, iosz, reopen; int remove = 0, rtextsize; - char *sp, *fbuf, *ptr; + char *sp, *fbuf, *ptr; char tbuf[ PATH_MAX ]; struct stat64 s1, s2; struct fsxattr fsxattr; @@ -167,7 +167,7 @@ rtcp( char *source, char *target, int fextsize) *ptr = '\0'; else snprintf(tbuf, sizeof(tbuf), "."); - } + } } if ( (rtextsize = xfsrtextsize( tbuf )) <= 0 ) { @@ -185,9 +185,9 @@ rtcp( char *source, char *target, int fextsize) if (S_ISDIR(s2.st_mode)) { snprintf(tbuf, sizeof(tbuf), "%s/%s", target, basename(source)); - } + } } - + if ( stat64(tbuf, &s2) ) { /* * create the file if it does not exist @@ -198,7 +198,7 @@ rtcp( char *source, char *target, int fextsize) return( -1 ); } remove = 1; - + /* * mark the file as a realtime file */ @@ -208,7 +208,7 @@ rtcp( char *source, char *target, int fextsize) else fsxattr.fsx_extsize = 0; - if ( xfsctl(tbuf, tofd, XFS_IOC_FSSETXATTR, &fsxattr) ) { + if ( xfsctl(tbuf, tofd, XFS_IOC_FSSETXATTR, &fsxattr) ) { fprintf(stderr, _("%s: set attributes on %s failed: %s\n"), progname, tbuf, strerror(errno)); @@ -225,7 +225,7 @@ rtcp( char *source, char *target, int fextsize) progname, tbuf, strerror(errno)); return( -1 ); } - + if ( xfsctl(tbuf, tofd, XFS_IOC_FSGETXATTR, &fsxattr) ) { fprintf(stderr, _("%s: get attributes of %s failed: %s\n"), @@ -242,7 +242,7 @@ rtcp( char *source, char *target, int fextsize) progname, tbuf); return( -1 ); } - + /* * check for matching extent size */ @@ -300,7 +300,7 @@ rtcp( char *source, char *target, int fextsize) progname, strerror(errno)); close( fromfd ); close( tofd ); - if ( remove ) + if ( remove ) unlink( tbuf ); return( -1 ); } @@ -327,7 +327,7 @@ rtcp( char *source, char *target, int fextsize) tbuf, (long long) (((s1.st_size / dioattr.d_miniosz) + 1) * dioattr.d_miniosz) ); - + } else { printf(_("Use the -p option to pad %s to a " "size which is a multiple of %d bytes.\n"), @@ -357,7 +357,7 @@ rtcp( char *source, char *target, int fextsize) /* * if there is a short read, pad to a block boundary - */ + */ if ( readct != iosz ) { if ( (readct % dioattr.d_miniosz) != 0 ) { readct = ( (readct/dioattr.d_miniosz) + 1 ) * @@ -366,7 +366,7 @@ rtcp( char *source, char *target, int fextsize) } /* - * write to target file + * write to target file */ writect = write( tofd, fbuf, readct); @@ -389,7 +389,7 @@ rtcp( char *source, char *target, int fextsize) } /* - * Determine the realtime extent size of the XFS file system + * Determine the realtime extent size of the XFS file system */ int xfsrtextsize( char *path) -- 2.39.2