Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / xfs / xfs_trans_item.c

diff --git a/fs/xfs/xfs_trans_item.c b/fs/xfs/xfs_trans_item.c
index 1b8a756..1117d60 100644 (file)
--- a/fs/xfs/xfs_trans_item.c
+++ b/fs/xfs/xfs_trans_item.c
@@ -1,40 +1,25 @@
 /*
- * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2002,2005 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
+ * 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.
  *
- * 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.
+ * 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.  See the
+ * GNU General Public License for more details.
  *
- * 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://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 #include "xfs.h"
-#include "xfs_macros.h"
+#include "xfs_fs.h"
 #include "xfs_types.h"
-#include "xfs_inum.h"
 #include "xfs_log.h"
+#include "xfs_inum.h"
 #include "xfs_trans.h"
 
 STATIC int     xfs_trans_unlock_chunk(xfs_log_item_chunk_t *,
@@ -93,7 +78,7 @@ xfs_trans_add_item(xfs_trans_t *tp, xfs_log_item_t *lip)
                lidp->lid_size = 0;
                lip->li_desc = lidp;
                lip->li_mountp = tp->t_mountp;
-               return (lidp);
+               return lidp;
        }
 
        /*
@@ -134,7 +119,7 @@ xfs_trans_add_item(xfs_trans_t *tp, xfs_log_item_t *lip)
        lidp->lid_size = 0;
        lip->li_desc = lidp;
        lip->li_mountp = tp->t_mountp;
-       return (lidp);
+       return lidp;
 }
 
 /*
@@ -195,7 +180,7 @@ xfs_trans_find_item(xfs_trans_t     *tp, xfs_log_item_t *lip)
 {
        ASSERT(lip->li_desc != NULL);
 
-       return (lip->li_desc);
+       return lip->li_desc;
 }
 
 
@@ -234,10 +219,10 @@ xfs_trans_first_item(xfs_trans_t *tp)
                        continue;
                }
 
-               return (XFS_LIC_SLOT(licp, i));
+               return XFS_LIC_SLOT(licp, i);
        }
        cmn_err(CE_WARN, "xfs_trans_first_item() -- no first item");
-       return(NULL);
+       return NULL;
 }
 
 
@@ -267,7 +252,7 @@ xfs_trans_next_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp)
                        continue;
                }
 
-               return (XFS_LIC_SLOT(licp, i));
+               return XFS_LIC_SLOT(licp, i);
        }
 
        /*
@@ -276,7 +261,7 @@ xfs_trans_next_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp)
         * If there is no next chunk, return NULL.
         */
        if (licp->lic_next == NULL) {
-               return (NULL);
+               return NULL;
        }
 
        licp = licp->lic_next;
@@ -286,7 +271,7 @@ xfs_trans_next_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp)
                        continue;
                }
 
-               return (XFS_LIC_SLOT(licp, i));
+               return XFS_LIC_SLOT(licp, i);
        }
        ASSERT(0);
        /* NOTREACHED */
@@ -440,7 +425,7 @@ xfs_trans_unlock_chunk(
                }
        }
 
-       return (freed);
+       return freed;
 }
 
 
@@ -493,7 +478,7 @@ xfs_trans_add_busy(xfs_trans_t *tp, xfs_agnumber_t ag, xfs_extlen_t idx)
                 */
                lbsp->lbc_ag = ag;
                lbsp->lbc_idx = idx;
-               return (lbsp);
+               return lbsp;
        }
 
        /*
@@ -527,7 +512,7 @@ xfs_trans_add_busy(xfs_trans_t *tp, xfs_agnumber_t ag, xfs_extlen_t idx)
        tp->t_busy_free--;
        lbsp->lbc_ag = ag;
        lbsp->lbc_idx = idx;
-       return (lbsp);
+       return lbsp;
 }