Commit e9fc2aa0 authored by Steven Whitehouse's avatar Steven Whitehouse

[GFS2] Update copyright, tidy up incore.h

As per comments from Jan Engelhardt <jengelh@linux01.gwdg.de> this
updates the copyright message to say "version" in full rather than
"v.2". Also incore.h has been updated to remove forward structure
declarations which are not required.

The gfs2_quota_lvb structure has now had endianess annotations added
to it. Also quota.c has been updated so that we now store the
lvb data locally in endian independant format to avoid needing
a structure in host endianess too. As a result the endianess
conversions are done as required at various points and thus the
conversion routines in lvb.[ch] are no longer required. I've
moved the one remaining constant in lvb.h thats used into lm.h
and removed the unused lvb.[ch].

I have not changed the HIF_ constants. That is left to a later patch
which I hope will unify the gh_flags and gh_iflags fields of the
struct gfs2_holder.

Cc: Jan Engelhardt <jengelh@linux01.gwdg.de>
Signed-off-by: Steven Whitehouse's avatarSteven Whitehouse <swhiteho@redhat.com>
parent c6e6f0ba
obj-$(CONFIG_GFS2_FS) += gfs2.o
gfs2-y := acl.o bmap.o daemon.o dir.o eaops.o eattr.o glock.o \
glops.o inode.o lm.o log.o lops.o locking.o lvb.o main.o meta_io.o \
glops.o inode.o lm.o log.o lops.o locking.o main.o meta_io.o \
mount.o ondisk.o ops_address.o ops_dentry.o ops_export.o ops_file.o \
ops_fstype.o ops_inode.o ops_super.o ops_vm.o quota.o \
recovery.o rgrp.o super.o sys.o trans.o util.o
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __ACL_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __BMAP_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __DAEMON_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
/*
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __DIR_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __EAOPS_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __EATTR_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __FORMAT_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __GFS2_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __GLOCK_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __GLOPS_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __INCORE_DOT_H__
......@@ -22,24 +22,12 @@
struct gfs2_log_operations;
struct gfs2_log_element;
struct gfs2_bitmap;
struct gfs2_rgrpd;
struct gfs2_bufdata;
struct gfs2_glock_operations;
struct gfs2_holder;
struct gfs2_glock;
struct gfs2_alloc;
struct gfs2_inode;
struct gfs2_file;
struct gfs2_revoke;
struct gfs2_revoke_replay;
struct gfs2_quota_data;
struct gfs2_log_buf;
struct gfs2_trans;
struct gfs2_ail;
struct gfs2_jdesc;
struct gfs2_args;
struct gfs2_tune;
struct gfs2_gl_hash_bucket;
struct gfs2_sbd;
......@@ -215,8 +203,8 @@ struct gfs2_glock {
struct gfs2_alloc {
/* Quota stuff */
struct gfs2_quota_data *al_qd[4];
struct gfs2_holder al_qd_ghs[4];
struct gfs2_quota_data *al_qd[2*MAXQUOTAS];
struct gfs2_holder al_qd_ghs[2*MAXQUOTAS];
unsigned int al_qd_num;
u32 al_requested; /* Filled in by caller of gfs2_inplace_reserve() */
......@@ -305,11 +293,11 @@ enum {
};
struct gfs2_quota_lvb {
uint32_t qb_magic;
uint32_t __pad;
uint64_t qb_limit; /* Hard limit of # blocks to alloc */
uint64_t qb_warn; /* Warn user when alloc is above this # */
int64_t qb_value; /* Current # blocks allocated */
__be32 qb_magic;
u32 __pad;
__be64 qb_limit; /* Hard limit of # blocks to alloc */
__be64 qb_warn; /* Warn user when alloc is above this # */
__be64 qb_value; /* Current # blocks allocated */
};
struct gfs2_quota_data {
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __INODE_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......@@ -22,7 +22,6 @@
#include "lm.h"
#include "super.h"
#include "util.h"
#include "lvb.h"
/**
* gfs2_lm_mount - mount a locking protocol
......
......@@ -4,12 +4,14 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __LM_DOT_H__
#define __LM_DOT_H__
#define GFS2_MIN_LVB_SIZE 32
int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent);
void gfs2_lm_others_may_mount(struct gfs2_sbd *sdp);
void gfs2_lm_unmount(struct gfs2_sbd *sdp);
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __LM_INTERFACE_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/module.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include "lock_dlm.h"
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef LOCK_DLM_DOT_H
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/init.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include "lock_dlm.h"
......
......@@ -3,7 +3,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/miscdevice.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/ctype.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include "lock_dlm.h"
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/module.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __LOG_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __LOPS_DOT_H__
......
/*
* Copyright (C) Sistina Software, Inc. 1997-2003 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
* of the GNU General Public License v.2.
*/
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/completion.h>
#include <linux/buffer_head.h>
#include <linux/gfs2_ondisk.h>
#include "gfs2.h"
#include "lm_interface.h"
#include "incore.h"
#include "lvb.h"
#define pv(struct, member, fmt) printk(KERN_INFO " "#member" = "fmt"\n", \
struct->member);
void gfs2_quota_lvb_in(struct gfs2_quota_lvb *qb, char *lvb)
{
struct gfs2_quota_lvb *str = (struct gfs2_quota_lvb *)lvb;
qb->qb_magic = be32_to_cpu(str->qb_magic);
qb->qb_limit = be64_to_cpu(str->qb_limit);
qb->qb_warn = be64_to_cpu(str->qb_warn);
qb->qb_value = be64_to_cpu(str->qb_value);
}
void gfs2_quota_lvb_out(struct gfs2_quota_lvb *qb, char *lvb)
{
struct gfs2_quota_lvb *str = (struct gfs2_quota_lvb *)lvb;
str->qb_magic = cpu_to_be32(qb->qb_magic);
str->qb_limit = cpu_to_be64(qb->qb_limit);
str->qb_warn = cpu_to_be64(qb->qb_warn);
str->qb_value = cpu_to_be64(qb->qb_value);
}
/*
* Copyright (C) Sistina Software, Inc. 1997-2003 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
* of the GNU General Public License v.2.
*/
#ifndef __LVB_DOT_H__
#define __LVB_DOT_H__
#define GFS2_MIN_LVB_SIZE 32
void gfs2_quota_lvb_in(struct gfs2_quota_lvb *qb, char *lvb);
void gfs2_quota_lvb_out(struct gfs2_quota_lvb *qb, char *lvb);
#endif /* __LVB_DOT_H__ */
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __DIO_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __MOUNT_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __OPS_ADDRESS_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __OPS_DENTRY_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __OPS_EXPORT_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __OPS_FILE_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __OPS_FSTYPE_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __OPS_INODE_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __OPS_SUPER_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#include <linux/sched.h>
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
#ifndef __OPS_VM_DOT_H__
......
......@@ -4,7 +4,7 @@
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
* of the GNU General Public License version 2.
*/
/*
......@@ -52,7 +52,6 @@
#include "glock.h"
#include "glops.h"
#include "log.h"
#include "lvb.h"
#include "meta_io.h"
#include "quota.h"
#include "rgrp.h"
......@@ -586,7 +585,7 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc,
struct page *page;
void *kaddr;
__be64 *ptr;
u64 value;
s64 value;
int err = -EIO;
page = grab_cache_page(mapping, index);
......@@ -627,7 +626,8 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc,
kaddr = kmap_atomic(page, KM_USER0);
ptr = (__be64 *)(kaddr + offset);
value = *ptr = cpu_to_be64(be64_to_cpu(*ptr) + change);
value = (s64)be64_to_cpu(*ptr) + change;
*ptr = cpu_to_be64(value);
flush_dcache_page(page);
kunmap_atomic(kaddr, KM_USER0);
err = 0;
......@@ -761,6 +761,7 @@ static int do_glock(struct gfs2_quota_data *qd, int force_refresh,
char buf[sizeof(struct gfs2_quota)];
struct file_ra_state ra_state;