Hello!
These three changesets replace recently added lock_kernels with
reiserfs wrappers (that would eventually evolve into real separate
locks), includes more C99 designated initialisers cleanups (this time
from Art Haas) and updates some reiserfs help entries.
You can pull these from bk://thebsh.namesys.com/bk/reiser3-linux-2.5
Diffstats:
journal.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
dir.c | 6 +++---
inode.c | 14 +++++++-------
namei.c | 18 +++++++++---------
super.c | 30 +++++++++++++++---------------
4 files changed, 34 insertions(+), 34 deletions(-)
Config.help | 33 ++++++++++++---------------------
1 files changed, 12 insertions(+), 21 deletions(-)
Plain text patches:
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.660 -> 1.661
# fs/reiserfs/journal.c 1.56 -> 1.57
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/30 green@angband.namesys.com 1.661
# reiserfs: lock_kernel is replaced with per superblock lock (kind of)
# --------------------------------------------
#
diff -Nru a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
--- a/fs/reiserfs/journal.c Mon Sep 30 18:57:13 2002
+++ b/fs/reiserfs/journal.c Mon Sep 30 18:57:13 2002
@@ -1806,8 +1806,7 @@
struct reiserfs_journal_list *jl ;
- /* FIXMEL: is this needed? */
- lock_kernel();
+ reiserfs_write_lock(ct->p_s_sb);
jl = SB_JOURNAL_LIST(ct->p_s_sb) + ct->jindex ;
@@ -1818,7 +1817,7 @@
kupdate_one_transaction(ct->p_s_sb, jl) ;
}
reiserfs_kfree(ct->self, sizeof(struct reiserfs_journal_commit_task), ct->p_s_sb) ;
- unlock_kernel();
+ reiserfs_write_unlock(ct->p_s_sb);
}
static void setup_commit_task_arg(struct reiserfs_journal_commit_task *ct,
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.661 -> 1.662
# fs/reiserfs/inode.c 1.69 -> 1.70
# fs/reiserfs/super.c 1.54 -> 1.55
# fs/reiserfs/dir.c 1.17 -> 1.18
# fs/reiserfs/namei.c 1.42 -> 1.43
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/10/01 green@angband.namesys.com 1.662
# reiserfs: C99 designated initializers, by Art Haas
# --------------------------------------------
#
diff -Nru a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c
--- a/fs/reiserfs/dir.c Tue Oct 1 10:32:06 2002
+++ b/fs/reiserfs/dir.c Tue Oct 1 10:32:06 2002
@@ -18,9 +18,9 @@
int reiserfs_dir_fsync(struct file *filp, struct dentry *dentry, int datasync) ;
struct file_operations reiserfs_dir_operations = {
- read: generic_read_dir,
- readdir: reiserfs_readdir,
- fsync: reiserfs_dir_fsync,
+ .read = generic_read_dir,
+ .readdir = reiserfs_readdir,
+ .fsync = reiserfs_dir_fsync,
};
int reiserfs_dir_fsync(struct file *filp, struct dentry *dentry, int datasync) {
diff -Nru a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
--- a/fs/reiserfs/inode.c Tue Oct 1 10:32:06 2002
+++ b/fs/reiserfs/inode.c Tue Oct 1 10:32:06 2002
@@ -2139,11 +2139,11 @@
}
struct address_space_operations reiserfs_address_space_operations = {
- writepage: reiserfs_writepage,
- readpage: reiserfs_readpage,
- releasepage: reiserfs_releasepage,
- sync_page: block_sync_page,
- prepare_write: reiserfs_prepare_write,
- commit_write: reiserfs_commit_write,
- bmap: reiserfs_aop_bmap
+ .writepage = reiserfs_writepage,
+ .readpage = reiserfs_readpage,
+ .releasepage = reiserfs_releasepage,
+ .sync_page = block_sync_page,
+ .prepare_write = reiserfs_prepare_write,
+ .commit_write = reiserfs_commit_write,
+ .bmap = reiserfs_aop_bmap
} ;
diff -Nru a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
--- a/fs/reiserfs/namei.c Tue Oct 1 10:32:06 2002
+++ b/fs/reiserfs/namei.c Tue Oct 1 10:32:06 2002
@@ -1301,14 +1301,14 @@
*/
struct inode_operations reiserfs_dir_inode_operations = {
//&reiserfs_dir_operations, /* default_file_ops */
- create: reiserfs_create,
- lookup: reiserfs_lookup,
- link: reiserfs_link,
- unlink: reiserfs_unlink,
- symlink: reiserfs_symlink,
- mkdir: reiserfs_mkdir,
- rmdir: reiserfs_rmdir,
- mknod: reiserfs_mknod,
- rename: reiserfs_rename,
+ .create = reiserfs_create,
+ .lookup = reiserfs_lookup,
+ .link = reiserfs_link,
+ .unlink = reiserfs_unlink,
+ .symlink = reiserfs_symlink,
+ .mkdir = reiserfs_mkdir,
+ .rmdir = reiserfs_rmdir,
+ .mknod = reiserfs_mknod,
+ .rename = reiserfs_rename,
};
diff -Nru a/fs/reiserfs/super.c b/fs/reiserfs/super.c
--- a/fs/reiserfs/super.c Tue Oct 1 10:32:06 2002
+++ b/fs/reiserfs/super.c Tue Oct 1 10:32:06 2002
@@ -474,25 +474,25 @@
struct super_operations reiserfs_sops =
{
- alloc_inode: reiserfs_alloc_inode,
- destroy_inode: reiserfs_destroy_inode,
- write_inode: reiserfs_write_inode,
- dirty_inode: reiserfs_dirty_inode,
- delete_inode: reiserfs_delete_inode,
- put_super: reiserfs_put_super,
- write_super: reiserfs_write_super,
- write_super_lockfs: reiserfs_write_super_lockfs,
- unlockfs: reiserfs_unlockfs,
- statfs: reiserfs_statfs,
- remount_fs: reiserfs_remount,
+ .alloc_inode = reiserfs_alloc_inode,
+ .destroy_inode = reiserfs_destroy_inode,
+ .write_inode = reiserfs_write_inode,
+ .dirty_inode = reiserfs_dirty_inode,
+ .delete_inode = reiserfs_delete_inode,
+ .put_super = reiserfs_put_super,
+ .write_super = reiserfs_write_super,
+ .write_super_lockfs = reiserfs_write_super_lockfs,
+ .unlockfs = reiserfs_unlockfs,
+ .statfs = reiserfs_statfs,
+ .remount_fs = reiserfs_remount,
};
static struct export_operations reiserfs_export_ops = {
- encode_fh: reiserfs_encode_fh,
- decode_fh: reiserfs_decode_fh,
- get_parent: reiserfs_get_parent,
- get_dentry: reiserfs_get_dentry,
+ .encode_fh = reiserfs_encode_fh,
+ .decode_fh = reiserfs_decode_fh,
+ .get_parent = reiserfs_get_parent,
+ .get_dentry = reiserfs_get_dentry,
} ;
/* this struct is used in reiserfs_getopt () for containing the value for those
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.662 -> 1.663
# fs/Config.help 1.16 -> 1.17
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/10/01 green@angband.namesys.com 1.663
# Update reiserfs config help entries.
# --------------------------------------------
#
diff -Nru a/fs/Config.help b/fs/Config.help
--- a/fs/Config.help Tue Oct 1 17:30:02 2002
+++ b/fs/Config.help Tue Oct 1 17:30:02 2002
@@ -37,27 +37,18 @@
CONFIG_REISERFS_FS
Stores not just filenames but the files themselves in a balanced
- tree. Uses journaling.
+ tree. Uses journalling.
Balanced trees are more efficient than traditional file system
architectural foundations.
In general, ReiserFS is as fast as ext2, but is very efficient with
- large directories and small files. Additional patches are needed
- for NFS and quotas, please see for links.
+ large directories and small files. It is much faster for writes,
+ and slightly slower for reads than ext2. It is much faster than
+ ext3. It will be obsoleted by Reiser4 in not too long, so keep
+ an eye on our website for when Reiser4 ships.
- It is more easily extended to have features currently found in
- database and keyword search systems than block allocation based file
- systems are. The next version will be so extended, and will support
- plugins consistent with our motto ``It takes more than a license to
- make source code open.''
-
- Read to learn more about reiserfs.
-
- Sponsored by Threshold Networks, Emusic.com, and Bigstorage.com.
-
- If you like it, you can pay us to add new features to it that you
- need, buy a support contract, or pay us to port it to another OS.
+ Read to learn more about reiserfs.
CONFIG_REISERFS_CHECK
If you set this to Y, then ReiserFS will perform every check it can
@@ -71,12 +62,12 @@
everyone should say N.
CONFIG_REISERFS_PROC_INFO
- Create under /proc/fs/reiserfs a hierarchy of files, displaying
- various ReiserFS statistics and internal data at the expense of
- making your kernel or module slightly larger (+8 KB). This also
- increases the amount of kernel memory required for each mount.
- Almost everyone but ReiserFS developers and people fine-tuning
- reiserfs or tracing problems should say N.
+ Create under /proc/fs/reiserfs hierarchy of files, displaying
+ various ReiserFS statistics and internal data on the expense of
+ making your kernel or module slightly larger (+8 KB). This also
+ increases amount of kernel memory required for each mount. Almost
+ everyone but ReiserFS developers and people fine-tuning reiserfs or
+ tracing problems should say N.
CONFIG_EXT2_FS
This is the de facto standard Linux file system (method to organize