CVS: intermezzo/presto24 configure.in,1.16,1.17 dcache.c,1.31,1.32 dir.c,1.80,1.81 file.c,1.41,1.42 inode.c,1.24,1.25 journal_ext3.c,1.13,1.14 journal_obdfs.c,1.5,1.6 journal_reiserfs.c,1.14,1.15 journal_xfs.c,1.9,1.10 psdev.c,1.47,1.48
Robert Read <[email protected]> Mon, 23 Sep 2002 15:10:09 -0700
| Newsgroups | gmane.comp.file-systems.intermezzo.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/intermezzo/intermezzo/presto24
In directory usw-pr-cvs1:/tmp/cvs-serv26579/fs24
Modified Files:
configure.in dcache.c dir.c file.c inode.c journal_ext3.c
journal_obdfs.c journal_reiserfs.c journal_xfs.c psdev.c
Log Message:
* apply various kernel janitor related patches
Index: configure.in
===================================================================
RCS file: /cvsroot/intermezzo/intermezzo/presto24/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -U2 -r1.16 -r1.17
--- configure.in 18 Feb 2002 16:48:54 -0000 1.16
+++ configure.in 23 Sep 2002 22:10:06 -0000 1.17
@@ -24,5 +24,6 @@
linuxdir_def=/usr/src/linux
-AC_ARG_ENABLE(linuxdir, [ --enable-linuxdir=[path] set path to Linux source (default=/usr/src/linux)],, enable_linuxdir=$linuxdir_def)
+AC_ARG_WITH(linux, [ --with-linux=[path] set path to Linux source (default=/usr/src/linux)], enable_linuxdir=$withval)
+AC_ARG_ENABLE(linuxdir, [ --enable-linuxdir=[path] (deprecated) set path to Linux source (default=/usr/src/linux)],, enable_linuxdir=$linuxdir_def)
LINUX=$enable_linuxdir
Index: dcache.c
===================================================================
RCS file: /cvsroot/intermezzo/intermezzo/presto24/dcache.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -U2 -r1.31 -r1.32
--- dcache.c 26 Jun 2002 07:35:06 -0000 1.31
+++ dcache.c 23 Sep 2002 22:10:06 -0000 1.32
@@ -115,6 +115,6 @@
struct dentry_operations presto_dentry_ops =
{
- d_revalidate: presto_d_revalidate,
- d_release: presto_d_release
+ .d_revalidate = presto_d_revalidate,
+ .d_release = presto_d_release
};
Index: dir.c
===================================================================
RCS file: /cvsroot/intermezzo/intermezzo/presto24/dir.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -U2 -r1.80 -r1.81
--- dir.c 3 May 2002 01:49:09 -0000 1.80
+++ dir.c 23 Sep 2002 22:10:06 -0000 1.81
@@ -1393,22 +1393,23 @@
struct file_operations presto_dir_fops = {
- ioctl: presto_ioctl
+ .ioctl = presto_ioctl
};
struct inode_operations presto_dir_iops = {
- create: presto_create,
- lookup: presto_lookup,
- link: presto_link,
- unlink: presto_unlink,
- symlink: presto_symlink,
- mkdir: presto_mkdir,
- rmdir: presto_rmdir,
- mknod: presto_mknod,
- rename: presto_rename,
- permission: presto_permission,
- setattr: presto_setattr,
+ .create = presto_create,
+ .lookup = presto_lookup,
+ .link = presto_link,
+ .unlink = presto_unlink,
+ .symlink = presto_symlink,
+ .mkdir = presto_mkdir,
+ .rmdir = presto_rmdir,
+ .mknod = presto_mknod,
+ .rename = presto_rename,
+ .permission = presto_permission,
+ .setattr = presto_setattr,
#ifdef CONFIG_FS_EXT_ATTR
- set_ext_attr: presto_set_ext_attr,
+ .set_ext_attr = presto_set_ext_attr,
#endif
-
};
+
+
Index: file.c
===================================================================
RCS file: /cvsroot/intermezzo/intermezzo/presto24/file.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -U2 -r1.41 -r1.42
--- file.c 26 Jun 2002 07:35:06 -0000 1.41
+++ file.c 23 Sep 2002 22:10:06 -0000 1.42
@@ -458,15 +458,15 @@
struct file_operations presto_file_fops = {
- write: presto_file_write,
- open: presto_file_open,
- release: presto_file_release,
- ioctl: presto_ioctl
+ .write = presto_file_write,
+ .open = presto_file_open,
+ .release = presto_file_release,
+ .ioctl = presto_ioctl
};
struct inode_operations presto_file_iops = {
- permission: presto_permission,
- setattr: presto_setattr,
+ .permission = presto_permission,
+ .setattr = presto_setattr,
#ifdef CONFIG_FS_EXT_ATTR
- set_ext_attr: presto_set_ext_attr,
+ .set_ext_attr = presto_set_ext_attr,
#endif
};
Index: inode.c
===================================================================
RCS file: /cvsroot/intermezzo/intermezzo/presto24/inode.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -U2 -r1.24 -r1.25
--- inode.c 7 Apr 2002 01:50:18 -0000 1.24
+++ inode.c 23 Sep 2002 22:10:06 -0000 1.25
@@ -174,6 +174,6 @@
struct super_operations presto_super_ops = {
- read_inode: presto_read_inode,
- put_super: presto_put_super,
+ .read_inode = presto_read_inode,
+ .put_super = presto_put_super,
};
@@ -181,5 +181,5 @@
/* symlinks can be chowned */
struct inode_operations presto_sym_iops = {
- setattr: presto_setattr
+ .setattr = presto_setattr
};
Index: journal_ext3.c
===================================================================
RCS file: /cvsroot/intermezzo/intermezzo/presto24/journal_ext3.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- journal_ext3.c 4 Mar 2002 00:18:34 -0000 1.13
+++ journal_ext3.c 23 Sep 2002 22:10:06 -0000 1.14
@@ -275,10 +275,10 @@
struct journal_ops presto_ext3_journal_ops = {
- tr_all_data: presto_e3_has_all_data,
- tr_avail: presto_e3_freespace,
- tr_start: presto_e3_trans_start,
- tr_commit: presto_e3_trans_commit,
- tr_journal_data: presto_e3_journal_file_data,
- tr_ilookup: presto_iget_ilookup
+ .tr_all_data = presto_e3_has_all_data,
+ .tr_avail = presto_e3_freespace,
+ .tr_start = presto_e3_trans_start,
+ .tr_commit = presto_e3_trans_commit,
+ .tr_journal_data = presto_e3_journal_file_data,
+ .tr_ilookup = presto_iget_ilookup
};
Index: journal_obdfs.c
===================================================================
RCS file: /cvsroot/intermezzo/intermezzo/presto24/journal_obdfs.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- journal_obdfs.c 27 Nov 2001 17:51:07 -0000 1.5
+++ journal_obdfs.c 23 Sep 2002 22:10:06 -0000 1.6
@@ -186,8 +186,8 @@
struct journal_ops presto_obdfs_journal_ops = {
- tr_avail: presto_obdfs_freespace,
- tr_start: presto_obdfs_trans_start,
- tr_commit: presto_obdfs_trans_commit,
- tr_journal_data: presto_obdfs_journal_file_data
+ .tr_avail = presto_obdfs_freespace,
+ .tr_start = presto_obdfs_trans_start,
+ .tr_commit = presto_obdfs_trans_commit,
+ .tr_journal_data = presto_obdfs_journal_file_data
};
Index: journal_reiserfs.c
===================================================================
RCS file: /cvsroot/intermezzo/intermezzo/presto24/journal_reiserfs.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- journal_reiserfs.c 10 Mar 2002 19:02:15 -0000 1.14
+++ journal_reiserfs.c 23 Sep 2002 22:10:06 -0000 1.15
@@ -132,9 +132,9 @@
struct journal_ops presto_reiserfs_journal_ops = {
- tr_all_data: presto_reiserfs_has_all_data,
- tr_avail: presto_reiserfs_freespace,
- tr_start: presto_reiserfs_trans_start,
- tr_commit: presto_reiserfs_trans_commit,
- tr_journal_data: presto_reiserfs_journal_file_data
+ .tr_all_data = presto_reiserfs_has_all_data,
+ .tr_avail = presto_reiserfs_freespace,
+ .tr_start = presto_reiserfs_trans_start,
+ .tr_commit = presto_reiserfs_trans_commit,
+ .tr_journal_data = presto_reiserfs_journal_file_data
};
Index: journal_xfs.c
===================================================================
RCS file: /cvsroot/intermezzo/intermezzo/presto24/journal_xfs.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- journal_xfs.c 27 Nov 2001 17:51:07 -0000 1.9
+++ journal_xfs.c 23 Sep 2002 22:10:06 -0000 1.10
@@ -33,4 +33,5 @@
#include <linux/string.h>
#if 0
+/* XFS Support not there yet */
#ifdef CONFIG_FS_XFS
#include <linux/xfs_fs.h>
@@ -148,9 +149,9 @@
struct journal_ops presto_xfs_journal_ops = {
- tr_all_data: presto_xfs_has_all_data,
- tr_avail: presto_xfs_freespace,
- tr_start: presto_xfs_trans_start,
- tr_commit: presto_xfs_trans_commit,
- tr_journal_data: presto_xfs_journal_file_data
+ .tr_all_data = presto_xfs_has_all_data,
+ .tr_avail = presto_xfs_freespace,
+ .tr_start = presto_xfs_trans_start,
+ .tr_commit = presto_xfs_trans_commit,
+ .tr_journal_data = presto_xfs_journal_file_data
};
Index: psdev.c
===================================================================
RCS file: /cvsroot/intermezzo/intermezzo/presto24/psdev.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -U2 -r1.47 -r1.48
--- psdev.c 24 Apr 2002 03:06:00 -0000 1.47
+++ psdev.c 23 Sep 2002 22:10:06 -0000 1.48
@@ -215,6 +215,5 @@
req = tmp;
/* unlink here: keeps search length minimal */
- list_del(&req->rq_chain);
- INIT_LIST_HEAD(&req->rq_chain);
+ list_del_init(&req->rq_chain);
CDEBUG(D_PSDEV,"Eureka opc %d uniq %d!\n",
hdr.opcode, hdr.unique);
@@ -371,9 +370,9 @@
static struct file_operations presto_psdev_fops = {
- read: presto_psdev_read,
- write: presto_psdev_write,
- poll: presto_psdev_poll,
- open: presto_psdev_open,
- release: presto_psdev_release
+ .read = presto_psdev_read,
+ .write = presto_psdev_write,
+ .poll = presto_psdev_poll,
+ .open = presto_psdev_open,
+ .release = presto_psdev_release
};
@@ -502,7 +501,6 @@
spin_lock(&channel->uc_lock);
- list_del(&req->rq_chain);
+ list_del_init(&req->rq_chain);
spin_unlock(&channel->uc_lock);
- INIT_LIST_HEAD(&req->rq_chain);
remove_wait_queue(&req->rq_sleep, &wait);
set_current_state(TASK_RUNNING);
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf