Merge branch 'master'

[linux-2.6-omap-h63xx.git] / fs / gfs2 / util.h

diff --git a/fs/gfs2/util.h b/fs/gfs2/util.h
index 21466fe9bf430034eb29e79a5ec3cd5819de73a1..8216d28bd816ebbd42ccf9bfff38f421ac5b2515 100644 (file)
--- a/fs/gfs2/util.h
+++ b/fs/gfs2/util.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
@@ -10,8 +10,6 @@
 #ifndef __UTIL_DOT_H__
 #define __UTIL_DOT_H__
 
-uint32_t gfs2_disk_hash(const char *data, int len);
-
 
 #define fs_printk(level, fs, fmt, arg...) \
        printk(level "GFS2: fsid=%s: " fmt , (fs)->sd_fsname , ## arg)
@@ -109,12 +107,11 @@ static inline int gfs2_metatype_check_i(struct gfs2_sbd *sdp,
 {
        struct gfs2_meta_header *mh = (struct gfs2_meta_header *)bh->b_data;
        uint32_t magic = mh->mh_magic;
-       uint16_t t = mh->mh_type;
+       uint16_t t = be32_to_cpu(mh->mh_type);
        magic = be32_to_cpu(magic);
        if (unlikely(magic != GFS2_MAGIC))
                return gfs2_meta_check_ii(sdp, bh, "magic number", function,
                                          file, line);
-       t = be16_to_cpu(t);
         if (unlikely(t != type))
                return gfs2_metatype_check_ii(sdp, bh, type, t, function,
                                              file, line);
@@ -129,8 +126,8 @@ static inline void gfs2_metatype_set(struct buffer_head *bh, uint16_t type,
 {
        struct gfs2_meta_header *mh;
        mh = (struct gfs2_meta_header *)bh->b_data;
-       mh->mh_type = cpu_to_be16(type);
-       mh->mh_format = cpu_to_be16(format);
+       mh->mh_type = cpu_to_be32(type);
+       mh->mh_format = cpu_to_be32(format);
 }
 
 
@@ -152,14 +149,6 @@ extern kmem_cache_t *gfs2_glock_cachep;
 extern kmem_cache_t *gfs2_inode_cachep;
 extern kmem_cache_t *gfs2_bufdata_cachep;
 
-struct gfs2_user_buffer {
-       char __user *ub_data;
-       unsigned int ub_size;
-       unsigned int ub_count;
-};
-
-int gfs2_add_bh_to_ub(struct gfs2_user_buffer *ub, struct buffer_head *bh);
-
 static inline unsigned int gfs2_tune_get_i(struct gfs2_tune *gt,
                                           unsigned int *p)
 {