Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (57 commits)
  [GFS2] Accept old format NFS filehandles
  [GFS2] Small fixes to logging code
  [DLM] dump more lock values
  [GFS2] Remove i_mode passing from NFS File Handle
  [GFS2] Obtaining no_formal_ino from directory entry
  [GFS2] git-gfs2-nmw-build-fix
  [GFS2] System won't suspend with GFS2 file system mounted
  [GFS2] remounting w/o acl option leaves acls enabled
  [GFS2] inode size inconsistency
  [DLM] Telnet to port 21064 can stop all lockspaces
  [GFS2] Fix gfs2_block_truncate_page err return
  [GFS2] Addendum to the journaled file/unmount patch
  [GFS2] Simplify multiple glock aquisition
  [GFS2] assertion failure after writing to journaled file, umount
  [GFS2] Use zero_user_page() in stuffed_readpage()
  [GFS2] Remove bogus '\0' in rgrp.c
  [GFS2] Journaled file write/unstuff bug
  [DLM] don't require FS flag on all nodes
  [GFS2] Fix deallocation issues
  [GFS2] return conflicts for GETLK
  ...

5 files changed, 93 insertions, 142 deletions

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index f317c270d4bf..afae306b177c 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -49,6 +49,7 @@ header-y += consolemap.h
 header-y += const.h
 header-y += cycx_cfm.h
 header-y += dlm_device.h
+header-y += dlm_netlink.h
 header-y += dm-ioctl.h
 header-y += dn.h
 header-y += dqblk_v1.h
diff --git a/include/linux/dlm.h b/include/linux/dlm.h
index 1b1dcb9a40bb..be9d278761e0 100644
--- a/include/linux/dlm.h
+++ b/include/linux/dlm.h
@@ -2,7 +2,7 @@
 *******************************************************************************
 **
 **  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
-**  Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
+**  Copyright (C) 2004-2007 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
@@ -85,7 +85,11 @@
  * Only relevant to locks originating in userspace.  A persistent lock will not
  * be removed if the process holding the lock exits.
  *
- * DLM_LKF_NODLKWT
+ * DLM_LKF_NODLCKWT
+ *
+ * Do not cancel the lock if it gets into conversion deadlock.
+ * Exclude this lock from being monitored due to DLM_LSFL_TIMEWARN.
+ *
  * DLM_LKF_NODLCKBLK
  *
  * net yet implemented
@@ -149,6 +153,7 @@
 #define DLM_LKF_ALTPR           0x00008000
 #define DLM_LKF_ALTCW           0x00010000
 #define DLM_LKF_FORCEUNLOCK     0x00020000
+#define DLM_LKF_TIMEOUT         0x00040000
 
 /*
  * Some return codes that are not in errno.h
@@ -199,11 +204,12 @@ struct dlm_lksb {
         char *   sb_lvbptr;
 };
 
+#define DLM_LSFL_NODIR          0x00000001
+#define DLM_LSFL_TIMEWARN       0x00000002
+#define DLM_LSFL_FS             0x00000004
 
 #ifdef __KERNEL__
 
-#define DLM_LSFL_NODIR          0x00000001
-
 /*
  * dlm_new_lockspace
  *
diff --git a/include/linux/dlm_device.h b/include/linux/dlm_device.h
index c2735cab2ebf..9642277a152a 100644
--- a/include/linux/dlm_device.h
+++ b/include/linux/dlm_device.h
@@ -2,7 +2,7 @@
 *******************************************************************************
 **
 **  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
-**  Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
+**  Copyright (C) 2004-2007 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
@@ -18,21 +18,24 @@
 #define DLM_USER_LVB_LEN        32
 
 /* Version of the device interface */
-#define DLM_DEVICE_VERSION_MAJOR 5
-#define DLM_DEVICE_VERSION_MINOR 1
+#define DLM_DEVICE_VERSION_MAJOR 6
+#define DLM_DEVICE_VERSION_MINOR 0
 #define DLM_DEVICE_VERSION_PATCH 0
 
 /* struct passed to the lock write */
 struct dlm_lock_params {
         __u8 mode;
         __u8 namelen;
-        __u16 flags;
+        __u16 unused;
+        __u32 flags;
         __u32 lkid;
         __u32 parent;
-        void __user *castparam;
+        __u64 xid;
+        __u64 timeout;
+        void __user *castparam;
         void __user *castaddr;
         void __user *bastparam;
-        void __user *bastaddr;
+        void __user *bastaddr;
         struct dlm_lksb __user *lksb;
         char lvb[DLM_USER_LVB_LEN];
         char name[0];
@@ -62,9 +65,15 @@ struct dlm_write_request {
         } i;
 };
 
+struct dlm_device_version {
+        __u32 version[3];
+};
+
 /* struct read from the "device" fd,
    consists mainly of userspace pointers for the library to use */
+
 struct dlm_lock_result {
+        __u32 version[3];
         __u32 length;
         void __user * user_astaddr;
         void __user * user_astparam;
@@ -83,6 +92,7 @@ struct dlm_lock_result {
 #define DLM_USER_CREATE_LOCKSPACE  4
 #define DLM_USER_REMOVE_LOCKSPACE  5
 #define DLM_USER_PURGE        6
+#define DLM_USER_DEADLOCK     7
 
 /* Arbitrary length restriction */
 #define MAX_LS_NAME_LEN 64
diff --git a/include/linux/dlm_netlink.h b/include/linux/dlm_netlink.h
new file mode 100644
index 000000000000..19276332707a
--- /dev/null
+++ b/include/linux/dlm_netlink.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2007 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 _DLM_NETLINK_H
+#define _DLM_NETLINK_H
+
+enum {
+        DLM_STATUS_WAITING = 1,
+        DLM_STATUS_GRANTED = 2,
+        DLM_STATUS_CONVERT = 3,
+};
+
+#define DLM_LOCK_DATA_VERSION 1
+
+struct dlm_lock_data {
+        uint16_t version;
+        uint32_t lockspace_id;
+        int nodeid;
+        int ownpid;
+        uint32_t id;
+        uint32_t remid;
+        uint64_t xid;
+        int8_t status;
+        int8_t grmode;
+        int8_t rqmode;
+        unsigned long timestamp;
+        int resource_namelen;
+        char resource_name[DLM_RESNAME_MAXLEN];
+};
+
+enum {
+        DLM_CMD_UNSPEC = 0,
+        DLM_CMD_HELLO,          /* user->kernel */
+        DLM_CMD_TIMEOUT,        /* kernel->user */
+        __DLM_CMD_MAX,
+};
+
+#define DLM_CMD_MAX (__DLM_CMD_MAX - 1)
+
+enum {
+        DLM_TYPE_UNSPEC = 0,
+        DLM_TYPE_LOCK,
+        __DLM_TYPE_MAX,
+};
+
+#define DLM_TYPE_MAX (__DLM_TYPE_MAX - 1)
+
+#define DLM_GENL_VERSION 0x1
+#define DLM_GENL_NAME "DLM"
+
+#endif /* _DLM_NETLINK_H */
diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index 8b7e4c1e32ae..a44a6a078f0a 100644
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
@@ -54,18 +54,6 @@ struct gfs2_inum {
         __be64 no_addr;
 };
 
-struct gfs2_inum_host {
-        __u64 no_formal_ino;
-        __u64 no_addr;
-};
-
-static inline int gfs2_inum_equal(const struct gfs2_inum_host *ino1,
-                                  const struct gfs2_inum_host *ino2)
-{
-        return ino1->no_formal_ino == ino2->no_formal_ino &&
-               ino1->no_addr == ino2->no_addr;
-}
-
 /*
  * Generic metadata head structure
  * Every inplace buffer logged in the journal must start with this.
@@ -94,12 +82,6 @@ struct gfs2_meta_header {
         __be32 __pad1;          /* Was incarnation number in gfs1 */
 };
 
-struct gfs2_meta_header_host {
-        __u32 mh_magic;
-        __u32 mh_type;
-        __u32 mh_format;
-};
-
 /*
  * super-block structure
  *
@@ -139,23 +121,6 @@ struct gfs2_sb {
         /* In gfs1, quota and license dinodes followed */
 };
 
-struct gfs2_sb_host {
-        struct gfs2_meta_header_host sb_header;
-
-        __u32 sb_fs_format;
-        __u32 sb_multihost_format;
-
-        __u32 sb_bsize;
-        __u32 sb_bsize_shift;
-
-        struct gfs2_inum_host sb_master_dir; /* Was jindex dinode in gfs1 */
-        struct gfs2_inum_host sb_root_dir;
-
-        char sb_lockproto[GFS2_LOCKNAME_LEN];
-        char sb_locktable[GFS2_LOCKNAME_LEN];
-        /* In gfs1, quota and license dinodes followed */
-};
-
 /*
  * resource index structure
  */
@@ -173,14 +138,6 @@ struct gfs2_rindex {
         __u8 ri_reserved[64];
 };
 
-struct gfs2_rindex_host {
-        __u64 ri_addr;  /* grp block disk address */
-        __u64 ri_data0; /* first data location */
-        __u32 ri_length;        /* length of rgrp header in fs blocks */
-        __u32 ri_data;  /* num of data blocks in rgrp */
-        __u32 ri_bitbytes;      /* number of bytes in data bitmaps */
-};
-
 /*
  * resource group header structure
  */
@@ -212,13 +169,6 @@ struct gfs2_rgrp {
         __u8 rg_reserved[80]; /* Several fields from gfs1 now reserved */
 };
 
-struct gfs2_rgrp_host {
-        __u32 rg_flags;
-        __u32 rg_free;
-        __u32 rg_dinodes;
-        __u64 rg_igeneration;
-};
-
 /*
  * quota structure
  */
@@ -230,12 +180,6 @@ struct gfs2_quota {
         __u8 qu_reserved[64];
 };
 
-struct gfs2_quota_host {
-        __u64 qu_limit;
-        __u64 qu_warn;
-        __u64 qu_value;
-};
-
 /*
  * dinode structure
  */
@@ -315,29 +259,11 @@ struct gfs2_dinode {
         struct gfs2_inum __pad4; /* Unused even in current gfs1 */
 
         __be64 di_eattr;        /* extended attribute block number */
+        __be32 di_atime_nsec;   /* nsec portion of atime */
+        __be32 di_mtime_nsec;   /* nsec portion of mtime */
+        __be32 di_ctime_nsec;   /* nsec portion of ctime */
 
-        __u8 di_reserved[56];
-};
-
-struct gfs2_dinode_host {
-        __u64 di_size;  /* number of bytes in file */
-        __u64 di_blocks;        /* number of blocks in file */
-
-        /* This section varies from gfs1. Padding added to align with
-         * remainder of dinode
-         */
-        __u64 di_goal_meta;     /* rgrp to alloc from next */
-        __u64 di_goal_data;     /* data block goal */
-        __u64 di_generation;    /* generation number for NFS */
-
-        __u32 di_flags; /* GFS2_DIF_... */
-        __u16 di_height;        /* height of metadata */
-
-        /* These only apply to directories  */
-        __u16 di_depth; /* Number of bits in the table */
-        __u32 di_entries;       /* The number of entries in the directory */
-
-        __u64 di_eattr; /* extended attribute block number */
+        __u8 di_reserved[44];
 };
 
 /*
@@ -414,16 +340,6 @@ struct gfs2_log_header {
         __be32 lh_hash;
 };
 
-struct gfs2_log_header_host {
-        struct gfs2_meta_header_host lh_header;
-
-        __u64 lh_sequence;      /* Sequence number of this transaction */
-        __u32 lh_flags; /* GFS2_LOG_HEAD_... */
-        __u32 lh_tail;          /* Block number of log tail */
-        __u32 lh_blkno;
-        __u32 lh_hash;
-};
-
 /*
  * Log type descriptor
  */
@@ -464,11 +380,6 @@ struct gfs2_inum_range {
         __be64 ir_length;
 };
 
-struct gfs2_inum_range_host {
-        __u64 ir_start;
-        __u64 ir_length;
-};
-
 /*
  * Statfs change
  * Describes an change to the pool of free and allocated
@@ -481,12 +392,6 @@ struct gfs2_statfs_change {
         __be64 sc_dinodes;
 };
 
-struct gfs2_statfs_change_host {
-        __u64 sc_total;
-        __u64 sc_free;
-        __u64 sc_dinodes;
-};
-
 /*
  * Quota change
  * Describes an allocation change for a particular
@@ -501,39 +406,12 @@ struct gfs2_quota_change {
         __be32 qc_id;
 };
 
-struct gfs2_quota_change_host {
-        __u64 qc_change;
-        __u32 qc_flags; /* GFS2_QCF_... */
-        __u32 qc_id;
+struct gfs2_quota_lvb {
+        __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 */
 };
 
-#ifdef __KERNEL__
-/* Translation functions */
-
-extern void gfs2_inum_in(struct gfs2_inum_host *no, const void *buf);
-extern void gfs2_inum_out(const struct gfs2_inum_host *no, void *buf);
-extern void gfs2_sb_in(struct gfs2_sb_host *sb, const void *buf);
-extern void gfs2_rindex_in(struct gfs2_rindex_host *ri, const void *buf);
-extern void gfs2_rindex_out(const struct gfs2_rindex_host *ri, void *buf);
-extern void gfs2_rgrp_in(struct gfs2_rgrp_host *rg, const void *buf);
-extern void gfs2_rgrp_out(const struct gfs2_rgrp_host *rg, void *buf);
-extern void gfs2_quota_in(struct gfs2_quota_host *qu, const void *buf);
-struct gfs2_inode;
-extern void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf);
-extern void gfs2_ea_header_in(struct gfs2_ea_header *ea, const void *buf);
-extern void gfs2_ea_header_out(const struct gfs2_ea_header *ea, void *buf);
-extern void gfs2_log_header_in(struct gfs2_log_header_host *lh, const void *buf);
-extern void gfs2_inum_range_in(struct gfs2_inum_range_host *ir, const void *buf);
-extern void gfs2_inum_range_out(const struct gfs2_inum_range_host *ir, void *buf);
-extern void gfs2_statfs_change_in(struct gfs2_statfs_change_host *sc, const void *buf);
-extern void gfs2_statfs_change_out(const struct gfs2_statfs_change_host *sc, void *buf);
-extern void gfs2_quota_change_in(struct gfs2_quota_change_host *qc, const void *buf);
-
-/* Printing functions */
-
-extern void gfs2_rindex_print(const struct gfs2_rindex_host *ri);
-extern void gfs2_dinode_print(const struct gfs2_inode *ip);
-
-#endif /* __KERNEL__ */
-
 #endif /* __GFS2_ONDISK_DOT_H__ */