CVS: is/patches/patches intermezzo.patch,1.1,1.2
"Peter J. Braam" <[email protected]> Wed, 11 Dec 2002 11:20:28 -0800
| Newsgroups | gmane.comp.file-systems.intermezzo.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/intermezzo/is/patches/patches
In directory sc8-pr-cvs1:/tmp/cvs-serv16839/patches
Modified Files:
intermezzo.patch
Log Message:
- regenerate patch with redhat 7.3 diffutils so that diffstat is not confused.
Index: intermezzo.patch
===================================================================
RCS file: /cvsroot/intermezzo/is/patches/patches/intermezzo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- intermezzo.patch 11 Dec 2002 19:08:41 -0000 1.1
+++ intermezzo.patch 11 Dec 2002 19:20:26 -0000 1.2
@@ -3,8 +3,20 @@
- 0 files changed
+ fs/intermezzo/dir.c | 6
+ fs/intermezzo/file.c | 2
+ fs/intermezzo/journal.c | 12 +
+ fs/intermezzo/kml_reint.c | 42 +++--
+ fs/intermezzo/kml_unpack.c | 12 +
+ fs/intermezzo/presto.c | 6
+ fs/intermezzo/replicator.c | 3
+ fs/intermezzo/vfs.c | 4
+ include/linux/fsfilter.h | 134 ++++++++++++++++++
+ include/linux/intermezzo_fs.h | 2
+ include/linux/intermezzo_idl.h | 304 +++++++++++++++++++++++++++++++++++++++++
+ include/linux/intermezzo_lib.h | 168 ++++++++++++++++++++++
+ 12 files changed, 663 insertions(+), 32 deletions(-)
---- linux-2.5.50/fs/intermezzo/dir.c~intermezzo 2002-12-10 20:53:33.000000000 -0700
-+++ linux-2.5.50-root/fs/intermezzo/dir.c 2002-12-10 20:53:33.000000000 -0700
+--- linux-2.5.50/fs/intermezzo/dir.c~intermezzo Tue Dec 10 20:53:33 2002
++++ linux-2.5.50-root/fs/intermezzo/dir.c Tue Dec 10 20:53:33 2002
@@ -342,7 +342,7 @@ int presto_setattr(struct dentry *de, st
int error;
@@ -27,6 +39,6 @@
if ( presto_get_permit(de->d_inode) < 0 ) {
EXIT;
---- linux-2.5.50/fs/intermezzo/file.c~intermezzo 2002-12-10 20:53:33.000000000 -0700
-+++ linux-2.5.50-root/fs/intermezzo/file.c 2002-12-10 20:53:33.000000000 -0700
+--- linux-2.5.50/fs/intermezzo/file.c~intermezzo Tue Dec 10 20:53:33 2002
++++ linux-2.5.50-root/fs/intermezzo/file.c Tue Dec 10 20:53:33 2002
@@ -61,7 +61,7 @@ extern int presto_permission(struct inod
@@ -38,6 +50,6 @@
struct presto_file_set *fset;
int pathlen;
---- linux-2.5.50/fs/intermezzo/journal.c~intermezzo 2002-12-10 20:53:33.000000000 -0700
-+++ linux-2.5.50-root/fs/intermezzo/journal.c 2002-12-10 20:59:09.000000000 -0700
+--- linux-2.5.50/fs/intermezzo/journal.c~intermezzo Tue Dec 10 20:53:33 2002
++++ linux-2.5.50-root/fs/intermezzo/journal.c Tue Dec 10 20:59:09 2002
@@ -363,8 +363,10 @@ static inline char *log_dentry_version(c
@@ -66,6 +78,6 @@
return logit(buf, &version, sizeof(version));
---- linux-2.5.50/fs/intermezzo/kml_reint.c~intermezzo 2002-12-10 20:53:33.000000000 -0700
-+++ linux-2.5.50-root/fs/intermezzo/kml_reint.c 2002-12-10 21:08:12.000000000 -0700
+--- linux-2.5.50/fs/intermezzo/kml_reint.c~intermezzo Tue Dec 10 20:53:33 2002
++++ linux-2.5.50-root/fs/intermezzo/kml_reint.c Tue Dec 10 21:08:12 2002
@@ -100,7 +100,8 @@ static inline int version_equal(struct p
return 0;
@@ -194,6 +206,6 @@
error = lento_unlink(path, info);
pop_ctxt(&saved_ctxt);
---- linux-2.5.50/fs/intermezzo/kml_unpack.c~intermezzo 2002-12-10 20:53:33.000000000 -0700
-+++ linux-2.5.50-root/fs/intermezzo/kml_unpack.c 2002-12-10 21:12:16.000000000 -0700
+--- linux-2.5.50/fs/intermezzo/kml_unpack.c~intermezzo Tue Dec 10 20:53:33 2002
++++ linux-2.5.50-root/fs/intermezzo/kml_unpack.c Tue Dec 10 21:12:16 2002
@@ -67,8 +67,10 @@ int kml_unpack_version(struct presto_ver
@@ -222,6 +234,6 @@
LUNLOGV(rec->old_mode, __u32, ptr, end);
LUNLOGV(rec->old_rdev, __u32, ptr, end);
---- linux-2.5.50/fs/intermezzo/presto.c~intermezzo 2002-12-10 20:53:33.000000000 -0700
-+++ linux-2.5.50-root/fs/intermezzo/presto.c 2002-12-10 21:13:20.000000000 -0700
+--- linux-2.5.50/fs/intermezzo/presto.c~intermezzo Tue Dec 10 20:53:33 2002
++++ linux-2.5.50-root/fs/intermezzo/presto.c Tue Dec 10 21:13:20 2002
@@ -627,8 +627,10 @@ int presto_put_permit(struct inode * ino
void presto_getversion(struct presto_version * presto_version,
@@ -237,6 +249,6 @@
}
---- linux-2.5.50/fs/intermezzo/replicator.c~intermezzo 2002-12-10 20:53:33.000000000 -0700
-+++ linux-2.5.50-root/fs/intermezzo/replicator.c 2002-12-10 21:15:33.000000000 -0700
+--- linux-2.5.50/fs/intermezzo/replicator.c~intermezzo Tue Dec 10 20:53:33 2002
++++ linux-2.5.50-root/fs/intermezzo/replicator.c Tue Dec 10 21:15:33 2002
@@ -29,7 +29,8 @@
#include <asm/uaccess.h>
@@ -249,6 +261,6 @@
/*
---- linux-2.5.50/fs/intermezzo/vfs.c~intermezzo 2002-12-10 20:53:33.000000000 -0700
-+++ linux-2.5.50-root/fs/intermezzo/vfs.c 2002-12-10 21:17:06.000000000 -0700
+--- linux-2.5.50/fs/intermezzo/vfs.c~intermezzo Tue Dec 10 20:53:33 2002
++++ linux-2.5.50-root/fs/intermezzo/vfs.c Tue Dec 10 21:17:06 2002
@@ -186,7 +186,7 @@ inline void presto_debug_fail_blkdev(str
@@ -269,6 +281,143 @@
CDEBUG(D_PIOCTL, "offset %d, recno %d, flags %#x\n",
info->slot_offset, info->recno, info->flags);
---- linux-2.5.50/include/linux/intermezzo_fs.h~intermezzo 2002-12-10 20:53:33.000000000 -0700
-+++ linux-2.5.50-root/include/linux/intermezzo_fs.h 2002-12-10 20:53:33.000000000 -0700
+--- /dev/null Fri Aug 30 17:31:37 2002
++++ linux-2.5.50-root/include/linux/fsfilter.h Wed Nov 27 15:35:47 2002
+@@ -0,0 +1,134 @@
++/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
++ * vim:expandtab:shiftwidth=8:tabstop=8:
++ */
++
++#ifndef __FILTER_H_
++#define __FILTER_H_ 1
++
++#ifdef __KERNEL__
++
++/* cachetype.c */
++
++/*
++ * it is important that things like inode, super and file operations
++ * for intermezzo are not defined statically. If methods are NULL
++ * the VFS takes special action based on that. Given that different
++ * cache types have NULL ops at different slots, we must install opeation
++ * talbes for InterMezzo with NULL's in the same spot
++ */
++
++struct filter_ops {
++ struct super_operations filter_sops;
++
++ struct inode_operations filter_dir_iops;
++ struct inode_operations filter_file_iops;
++ struct inode_operations filter_sym_iops;
++
++ struct file_operations filter_dir_fops;
++ struct file_operations filter_file_fops;
++ struct file_operations filter_sym_fops;
++
++ struct dentry_operations filter_dentry_ops;
++};
++
++struct cache_ops {
++ /* operations on the file store */
++ struct super_operations *cache_sops;
++
++ struct inode_operations *cache_dir_iops;
++ struct inode_operations *cache_file_iops;
++ struct inode_operations *cache_sym_iops;
++
++ struct file_operations *cache_dir_fops;
++ struct file_operations *cache_file_fops;
++ struct file_operations *cache_sym_fops;
++
++ struct dentry_operations *cache_dentry_ops;
++};
++
++
++#define FILTER_DID_SUPER_OPS 0x1
++#define FILTER_DID_INODE_OPS 0x2
++#define FILTER_DID_FILE_OPS 0x4
++#define FILTER_DID_DENTRY_OPS 0x8
++#define FILTER_DID_DEV_OPS 0x10
++#define FILTER_DID_SYMLINK_OPS 0x20
++#define FILTER_DID_DIR_OPS 0x40
++
++struct filter_fs {
++ int o_flags;
++ struct filter_ops o_fops;
++ struct cache_ops o_caops;
++ struct journal_ops *o_trops;
++ struct snapshot_ops *o_snops;
++};
++
++#define FILTER_FS_TYPES 6
++#define FILTER_FS_EXT2 0
++#define FILTER_FS_EXT3 1
++#define FILTER_FS_REISERFS 2
++#define FILTER_FS_XFS 3
++#define FILTER_FS_OBDFS 4
++#define FILTER_FS_TMPFS 5
++extern struct filter_fs filter_oppar[FILTER_FS_TYPES];
++
++struct filter_fs *filter_get_filter_fs(const char *cache_type);
++void filter_setup_journal_ops(struct filter_fs *ops, char *cache_type);
++inline struct super_operations *filter_c2usops(struct filter_fs *cache);
++inline struct inode_operations *filter_c2ufiops(struct filter_fs *cache);
++inline struct inode_operations *filter_c2udiops(struct filter_fs *cache);
++inline struct inode_operations *filter_c2usiops(struct filter_fs *cache);
++inline struct file_operations *filter_c2uffops(struct filter_fs *cache);
++inline struct file_operations *filter_c2udfops(struct filter_fs *cache);
++inline struct file_operations *filter_c2usfops(struct filter_fs *cache);
++inline struct super_operations *filter_c2csops(struct filter_fs *cache);
++inline struct inode_operations *filter_c2cfiops(struct filter_fs *cache);
++inline struct inode_operations *filter_c2cdiops(struct filter_fs *cache);
++inline struct inode_operations *filter_c2csiops(struct filter_fs *cache);
++inline struct file_operations *filter_c2cffops(struct filter_fs *cache);
++inline struct file_operations *filter_c2cdfops(struct filter_fs *cache);
++inline struct file_operations *filter_c2csfops(struct filter_fs *cache);
++inline struct dentry_operations *filter_c2cdops(struct filter_fs *cache);
++inline struct dentry_operations *filter_c2udops(struct filter_fs *cache);
++
++void filter_setup_super_ops(struct filter_fs *cache, struct super_operations *cache_ops, struct super_operations *filter_sops);
++void filter_setup_dir_ops(struct filter_fs *cache, struct inode *cache_inode, struct inode_operations *filter_iops, struct file_operations *ffops);
++void filter_setup_file_ops(struct filter_fs *cache, struct inode *cache_inode, struct inode_operations *filter_iops, struct file_operations *filter_op);
++void filter_setup_symlink_ops(struct filter_fs *cache, struct inode *cache_inode, struct inode_operations *filter_iops, struct file_operations *filter_op);
++void filter_setup_dentry_ops(struct filter_fs *cache, struct dentry_operations *cache_dop, struct dentry_operations *filter_dop);
++
++
++#define PRESTO_DEBUG
++#ifdef PRESTO_DEBUG
++/* debugging masks */
++#define D_SUPER 1
++#define D_INODE 2 /* print entry and exit into procedure */
++#define D_FILE 4
++#define D_CACHE 8 /* cache debugging */
++#define D_MALLOC 16 /* print malloc, de-alloc information */
++#define D_JOURNAL 32
++#define D_UPCALL 64 /* up and downcall debugging */
++#define D_PSDEV 128
++#define D_PIOCTL 256
++#define D_SPECIAL 512
++#define D_TIMING 1024
++#define D_DOWNCALL 2048
++
++#define FDEBUG(mask, format, a...) \
++ do { \
++ if (filter_debug & mask) { \
++ printk("(%s,l. %d): ", __FUNCTION__, __LINE__); \
++ printk(format, ##a); } \
++ } while (0)
++
++#define FENTRY \
++ if(filter_print_entry) \
++ printk("Process %d entered %s\n", current->pid, __FUNCTION__)
++
++#define FEXIT \
++ if(filter_print_entry) \
++ printk("Process %d leaving %s at %d\n", current->pid, \
++ __FUNCTION__,__LINE__)
++#endif
++#endif
++#endif
+--- linux-2.5.50/include/linux/intermezzo_fs.h~intermezzo Tue Dec 10 20:53:33 2002
++++ linux-2.5.50-root/include/linux/intermezzo_fs.h Tue Dec 10 20:53:33 2002
@@ -39,7 +39,7 @@ typedef __u8 uuid_t[16];
@@ -280,6 +429,6 @@
__u64 remote_generation;
__u32 slot_offset;
---- /dev/null 2002-08-30 17:31:37.000000000 -0600
-+++ linux-2.5.50-root/include/linux/intermezzo_idl.h 2002-12-10 21:10:33.000000000 -0700
+--- /dev/null Fri Aug 30 17:31:37 2002
++++ linux-2.5.50-root/include/linux/intermezzo_idl.h Tue Dec 10 21:10:33 2002
@@ -0,0 +1,304 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
@@ -587,6 +736,6 @@
+
+#endif
---- /dev/null 2002-08-30 17:31:37.000000000 -0600
-+++ linux-2.5.50-root/include/linux/intermezzo_lib.h 2002-12-10 20:53:33.000000000 -0700
+--- /dev/null Fri Aug 30 17:31:37 2002
++++ linux-2.5.50-root/include/linux/intermezzo_lib.h Tue Dec 10 20:53:33 2002
@@ -0,0 +1,168 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
-------------------------------------------------------
This sf.net email is sponsored by:
With Great Power, Comes Great Responsibility
Learn to use your power at OSDN's High Performance Computing Channel
http://hpc.devchannel.org/