[Ocfs2-commits] jlbec commits r1073 - branches/format-changes/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Sat Jun 12 21:28:24 CDT 2004
Author: jlbec
Date: 2004-06-12 20:28:23 -0500 (Sat, 12 Jun 2004)
New Revision: 1073
Modified:
branches/format-changes/src/alloc.c
branches/format-changes/src/alloc.h
branches/format-changes/src/bitmap.c
branches/format-changes/src/bitmap.h
branches/format-changes/src/buffer_head_io.c
branches/format-changes/src/dcache.c
branches/format-changes/src/dcache.h
branches/format-changes/src/dir.c
branches/format-changes/src/dir.h
branches/format-changes/src/dlm.c
branches/format-changes/src/dlm.h
branches/format-changes/src/extmap.c
branches/format-changes/src/extmap.h
branches/format-changes/src/file.c
branches/format-changes/src/file.h
branches/format-changes/src/hash.c
branches/format-changes/src/hash.h
branches/format-changes/src/heartbeat.c
branches/format-changes/src/heartbeat.h
branches/format-changes/src/inode.c
branches/format-changes/src/inode.h
branches/format-changes/src/ioctl.c
branches/format-changes/src/ioctl.h
branches/format-changes/src/journal.c
branches/format-changes/src/journal.h
branches/format-changes/src/lockres.c
branches/format-changes/src/lockres.h
branches/format-changes/src/namei.c
branches/format-changes/src/namei.h
branches/format-changes/src/nm.c
branches/format-changes/src/nm.h
branches/format-changes/src/ocfs.h
branches/format-changes/src/ocfs1_fs_compat.h
branches/format-changes/src/ocfs2_fs.h
branches/format-changes/src/ocfs_buffer_head.h
branches/format-changes/src/ocfs_compat.h
branches/format-changes/src/ocfs_journal.h
branches/format-changes/src/ocfs_log.h
branches/format-changes/src/proc.c
branches/format-changes/src/proc.h
branches/format-changes/src/super.c
branches/format-changes/src/super.h
branches/format-changes/src/symlink.c
branches/format-changes/src/symlink.h
branches/format-changes/src/sysfile.c
branches/format-changes/src/sysfile.h
branches/format-changes/src/util.c
branches/format-changes/src/util.h
branches/format-changes/src/ver.c
branches/format-changes/src/ver.h
branches/format-changes/src/volcfg.c
branches/format-changes/src/volcfg.h
branches/format-changes/src/vote.c
branches/format-changes/src/vote.h
Log:
o Use OCFS_LAST_GLOBAL_SYSTEM_INODE to differentiate the boundary
between one-copy global system inodes, and many-copy node-specific
system inodes.
o Add vim/emacs magic to header comments.
Modified: branches/format-changes/src/alloc.c
===================================================================
--- branches/format-changes/src/alloc.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/alloc.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* alloc.c
*
* Extent allocs and frees
Modified: branches/format-changes/src/alloc.h
===================================================================
--- branches/format-changes/src/alloc.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/alloc.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* alloc.h
*
* Function prototypes
Modified: branches/format-changes/src/bitmap.c
===================================================================
--- branches/format-changes/src/bitmap.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/bitmap.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* bitmap.c
*
* Bitmap infrastructure code
Modified: branches/format-changes/src/bitmap.h
===================================================================
--- branches/format-changes/src/bitmap.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/bitmap.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* bitmap.h
*
* Function prototypes
Modified: branches/format-changes/src/buffer_head_io.c
===================================================================
--- branches/format-changes/src/buffer_head_io.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/buffer_head_io.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* io.c
*
* Buffer cache handling
Modified: branches/format-changes/src/dcache.c
===================================================================
--- branches/format-changes/src/dcache.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/dcache.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* dcache.c
*
* dentry cache handling code
Modified: branches/format-changes/src/dcache.h
===================================================================
--- branches/format-changes/src/dcache.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/dcache.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* dcache.h
*
* Function prototypes
Modified: branches/format-changes/src/dir.c
===================================================================
--- branches/format-changes/src/dir.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/dir.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* dir.c
*
* Creates, reads, walks and deletes directory-nodes
Modified: branches/format-changes/src/dir.h
===================================================================
--- branches/format-changes/src/dir.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/dir.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* dir.h
*
* Function prototypes
Modified: branches/format-changes/src/dlm.c
===================================================================
--- branches/format-changes/src/dlm.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/dlm.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* dlm.c
*
* Distributed lock manager. Requests and processes lock votes.
Modified: branches/format-changes/src/dlm.h
===================================================================
--- branches/format-changes/src/dlm.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/dlm.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* dlm.h
*
* Function prototypes
Modified: branches/format-changes/src/extmap.c
===================================================================
--- branches/format-changes/src/extmap.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/extmap.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* extmap.c
*
* Creates, adds, coalesces, deletes extent maps
Modified: branches/format-changes/src/extmap.h
===================================================================
--- branches/format-changes/src/extmap.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/extmap.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* extmap.h
*
* Function prototypes
Modified: branches/format-changes/src/file.c
===================================================================
--- branches/format-changes/src/file.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/file.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* file.c
*
* File open, close, extend, truncate
Modified: branches/format-changes/src/file.h
===================================================================
--- branches/format-changes/src/file.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/file.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* file.h
*
* Function prototypes
Modified: branches/format-changes/src/hash.c
===================================================================
--- branches/format-changes/src/hash.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/hash.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* hash.c
*
* lockid hash, bh sem hash, inode hash
Modified: branches/format-changes/src/hash.h
===================================================================
--- branches/format-changes/src/hash.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/hash.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* hash.h
*
* Function prototypes
Modified: branches/format-changes/src/heartbeat.c
===================================================================
--- branches/format-changes/src/heartbeat.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/heartbeat.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* heartbeat.c
*
* Keeps track of alive nodes in the cluster.
Modified: branches/format-changes/src/heartbeat.h
===================================================================
--- branches/format-changes/src/heartbeat.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/heartbeat.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* heartbeat.h
*
* Function prototypes
Modified: branches/format-changes/src/inode.c
===================================================================
--- branches/format-changes/src/inode.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/inode.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* inode.c
*
* vfs' aops, fops, dops and iops
Modified: branches/format-changes/src/inode.h
===================================================================
--- branches/format-changes/src/inode.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/inode.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* inode.h
*
* Function prototypes
Modified: branches/format-changes/src/ioctl.c
===================================================================
--- branches/format-changes/src/ioctl.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/ioctl.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* ioctl.c
*
* ioctl interface
Modified: branches/format-changes/src/ioctl.h
===================================================================
--- branches/format-changes/src/ioctl.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/ioctl.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* ioctl.h
*
* Function prototypes
Modified: branches/format-changes/src/journal.c
===================================================================
--- branches/format-changes/src/journal.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/journal.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* journal.c
*
* Defines functions of journalling api
Modified: branches/format-changes/src/journal.h
===================================================================
--- branches/format-changes/src/journal.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/journal.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* journal.h
*
* Function prototypes
Modified: branches/format-changes/src/lockres.c
===================================================================
--- branches/format-changes/src/lockres.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/lockres.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* lockres.c
*
* lock resource handling
Modified: branches/format-changes/src/lockres.h
===================================================================
--- branches/format-changes/src/lockres.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/lockres.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* lockres.h
*
* Function prototypes
Modified: branches/format-changes/src/namei.c
===================================================================
--- branches/format-changes/src/namei.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/namei.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* namei.c
*
* Create and rename file, directory, symlinks
Modified: branches/format-changes/src/namei.h
===================================================================
--- branches/format-changes/src/namei.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/namei.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* namei.h
*
* Function prototypes
Modified: branches/format-changes/src/nm.c
===================================================================
--- branches/format-changes/src/nm.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/nm.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* nm.c
*
* net and disk process vote, nm thread, etc.
Modified: branches/format-changes/src/nm.h
===================================================================
--- branches/format-changes/src/nm.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/nm.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* nm.h
*
* Function prototypes
Modified: branches/format-changes/src/ocfs.h
===================================================================
--- branches/format-changes/src/ocfs.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/ocfs.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* ocfs.h
*
* Defines macros and structures used in ocfs
@@ -930,7 +932,7 @@
__u32 node_num;
int reclaim_id; /* reclaim the original node number*/
__u32 hbt;
- unsigned long s_clustersize;
+ int s_clustersize;
int s_clustersize_bits;
int needs_flush;
Modified: branches/format-changes/src/ocfs1_fs_compat.h
===================================================================
--- branches/format-changes/src/ocfs1_fs_compat.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/ocfs1_fs_compat.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* ocfs1_fs_compat.h
*
* OCFS1 volume header definitions. OCFS2 creates valid but unmountable
Modified: branches/format-changes/src/ocfs2_fs.h
===================================================================
--- branches/format-changes/src/ocfs2_fs.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/ocfs2_fs.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* ocfs2_fs.h
*
* On-disk structures for OCFS2.
@@ -81,7 +83,13 @@
NUM_SYSTEM_INODES
};
+/*
+ * The last system inode that has only one global copy. Every system
+ * inode after it in the system inode enum has a node-specific copy.
+ */
+#define OCFS_LAST_GLOBAL_SYSTEM_INODE ORPHAN_DIR_SYSTEM_INODE
+
/* Default size for the local alloc bitmap */
#define OCFS2_LOCAL_BITMAP_DEFAULT_SIZE 256
Modified: branches/format-changes/src/ocfs_buffer_head.h
===================================================================
--- branches/format-changes/src/ocfs_buffer_head.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/ocfs_buffer_head.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* ocfs_buffer_head.h
*
* Buffer cache handling functions defined
Modified: branches/format-changes/src/ocfs_compat.h
===================================================================
--- branches/format-changes/src/ocfs_compat.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/ocfs_compat.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* ocfs_compat.h
*
* Compatibility stuff for 2.4
Modified: branches/format-changes/src/ocfs_journal.h
===================================================================
--- branches/format-changes/src/ocfs_journal.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/ocfs_journal.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* journal.h
*
* Defines journalling api and structures.
Modified: branches/format-changes/src/ocfs_log.h
===================================================================
--- branches/format-changes/src/ocfs_log.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/ocfs_log.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* ocfs_log.h
*
* Defines macros and flags used for logging.
Modified: branches/format-changes/src/proc.c
===================================================================
--- branches/format-changes/src/proc.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/proc.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* proc.c
*
* proc interface
@@ -504,7 +506,7 @@
"File open count : %lld\n" \
"Publish map : %s\n" \
"Number of nodes : %u\n" \
- "Cluster size : %u\n" \
+ "Cluster size : %d\n" \
"Volume size : %llu\n" \
"Failed Large Allocs : %u\n" \
"Retry Large Allocs : %u\n" \
@@ -512,7 +514,7 @@
len = sprintf (page, PROC_STATS, osb->file_open_cnt, pubmap,
osb->num_nodes, osb->s_clustersize,
- osb->cluster_bitmap.validbits << osb->s_clustersize_bits,
+ (u64)osb->cluster_bitmap.validbits << osb->s_clustersize_bits,
osb->cluster_bitmap.failed,
osb->cluster_bitmap.ok_retries,
osb->inode_hash.num_ents);
Modified: branches/format-changes/src/proc.h
===================================================================
--- branches/format-changes/src/proc.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/proc.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* proc.h
*
* Function prototypes
Modified: branches/format-changes/src/super.c
===================================================================
--- branches/format-changes/src/super.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/super.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* super.c
*
* load/unload driver, mount/dismount volumes
Modified: branches/format-changes/src/super.h
===================================================================
--- branches/format-changes/src/super.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/super.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* super.h
*
* Function prototypes
Modified: branches/format-changes/src/symlink.c
===================================================================
--- branches/format-changes/src/symlink.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/symlink.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* linux/cluster/ssi/cfs/symlink.c
*
* This program is free software; you can redistribute it and/or
Modified: branches/format-changes/src/symlink.h
===================================================================
--- branches/format-changes/src/symlink.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/symlink.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* symlink.h
*
* Function prototypes
Modified: branches/format-changes/src/sysfile.c
===================================================================
--- branches/format-changes/src/sysfile.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/sysfile.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* sysfile.c
*
* Initialize, read, write, etc. system files.
@@ -79,25 +81,26 @@
return (node == osb->node_num || is_global_system_inode(type));
}
-struct inode * ocfs_get_system_file_inode(ocfs_super *osb, int type, __u32 node)
+struct inode *ocfs_get_system_file_inode(ocfs_super *osb, int type,
+ __u32 node)
{
struct inode *inode = NULL;
struct inode **arr = NULL;
- // avoid the lookup if cached in local system file array
+ /* avoid the lookup if cached in local system file array */
if (is_in_system_inode_array(osb, type, node))
arr = &(osb->system_inodes[type]);
if ((inode = *arr) != NULL) {
- // get a ref in addition to the array ref
+ /* get a ref in addition to the array ref */
igrab(inode);
return inode;
}
- // this gets one ref thru iget
+ /* this gets one ref thru iget */
inode = _ocfs_get_system_file_inode(osb, type, node);
- // add one more if putting into array for first time
+ /* add one more if putting into array for first time */
if (arr)
*arr = igrab(inode);
return inode;
@@ -112,8 +115,12 @@
struct ocfs2_dir_entry *de = NULL;
int status = 0;
- if (type <= ORPHAN_DIR_SYSTEM_INODE)
- /* "There Can Be Only One!" */
+ /*
+ * Global system inodes can only have one copy. Everything
+ * after OCFS_LAST_GLOBAL_SYSTEM_INODE in the system inode
+ * list has a copy per node.
+ */
+ if (type <= OCFS_LAST_GLOBAL_SYSTEM_INODE)
sprintf(namebuf, system_file_names[type]);
else
sprintf(namebuf, system_file_names[type], node);
Modified: branches/format-changes/src/sysfile.h
===================================================================
--- branches/format-changes/src/sysfile.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/sysfile.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* sysfile.h
*
* Function prototypes
Modified: branches/format-changes/src/util.c
===================================================================
--- branches/format-changes/src/util.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/util.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* util.c
*
* General purpose code
Modified: branches/format-changes/src/util.h
===================================================================
--- branches/format-changes/src/util.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/util.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* util.h
*
* Function prototypes
Modified: branches/format-changes/src/ver.c
===================================================================
--- branches/format-changes/src/ver.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/ver.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* ver.c
*
* version string
Modified: branches/format-changes/src/ver.h
===================================================================
--- branches/format-changes/src/ver.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/ver.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* ver.h
*
* Function prototypes
Modified: branches/format-changes/src/volcfg.c
===================================================================
--- branches/format-changes/src/volcfg.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/volcfg.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* volcfg.c
*
* Auto configuration, namely, node number.
Modified: branches/format-changes/src/volcfg.h
===================================================================
--- branches/format-changes/src/volcfg.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/volcfg.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* volcfg.h
*
* Function prototypes
Modified: branches/format-changes/src/vote.c
===================================================================
--- branches/format-changes/src/vote.c 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/vote.c 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* vote.c
*
* netdlm listener, receive, verify and send messages
Modified: branches/format-changes/src/vote.h
===================================================================
--- branches/format-changes/src/vote.h 2004-06-13 00:58:39 UTC (rev 1072)
+++ branches/format-changes/src/vote.h 2004-06-13 01:28:23 UTC (rev 1073)
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 9; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
* vote.h
*
* Function prototypes
More information about the Ocfs2-commits
mailing list