*/
#include <linux/fs.h>
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/parser.h>
#include <linux/completion.h>
#include <linux/vfs.h>
#include <linux/mount.h>
#include <linux/moduleparam.h>
-#include <linux/kthread.h>
#include <linux/posix_acl.h>
-#include <linux/buffer_head.h>
#include <asm/uaccess.h>
#include <linux/seq_file.h>
module_param(commit_threads, int, 0);
MODULE_PARM_DESC(commit_threads, "Number of commit threads");
-static struct task_struct *jfsCommitThread[MAX_COMMIT_THREADS];
-struct task_struct *jfsIOthread;
-struct task_struct *jfsSyncThread;
+int jfs_stop_threads;
+static pid_t jfsIOthread;
+static pid_t jfsCommitThread[MAX_COMMIT_THREADS];
+static pid_t jfsSyncThread;
+DECLARE_COMPLETION(jfsIOwait);
#ifdef CONFIG_JFS_DEBUG
int jfsloglevel = JFS_LOGLEVEL_WARN;
kmem_cache_free(jfs_inode_cachep, ji);
}
-static int jfs_statfs(struct dentry *dentry, struct kstatfs *buf)
+static int jfs_statfs(struct super_block *sb, struct kstatfs *buf)
{
- struct jfs_sb_info *sbi = JFS_SBI(dentry->d_sb);
+ struct jfs_sb_info *sbi = JFS_SBI(sb);
s64 maxinodes;
struct inomap *imap = JFS_IP(sbi->ipimap)->i_imap;
enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota,
- Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask,
- Opt_tagxid
+ Opt_usrquota, Opt_grpquota, Opt_tagxid
};
static match_table_t tokens = {
{Opt_ignore, "quota"},
{Opt_usrquota, "usrquota"},
{Opt_grpquota, "grpquota"},
- {Opt_uid, "uid=%u"},
- {Opt_gid, "gid=%u"},
- {Opt_umask, "umask=%u"},
{Opt_err, NULL}
};
break;
}
-#ifdef CONFIG_QUOTA
+#if defined(CONFIG_QUOTA)
case Opt_quota:
case Opt_usrquota:
*flag |= JFS_USRQUOTA;
"JFS: quota operations not supported\n");
break;
#endif
- case Opt_uid:
- {
- char *uid = args[0].from;
- sbi->uid = simple_strtoul(uid, &uid, 0);
- break;
- }
- case Opt_gid:
- {
- char *gid = args[0].from;
- sbi->gid = simple_strtoul(gid, &gid, 0);
- break;
- }
- case Opt_umask:
- {
- char *umask = args[0].from;
- sbi->umask = simple_strtoul(umask, &umask, 8);
- if (sbi->umask & ~0777) {
- printk(KERN_ERR
- "JFS: Invalid value of umask\n");
- goto cleanup;
- }
- break;
- }
-#ifndef CONFIG_TAGGING_NONE
+#ifndef CONFIG_INOXID_NONE
case Opt_tagxid:
*flag |= JFS_TAGXID;
break;
if (!new_valid_dev(sb->s_bdev->bd_dev))
return -EOVERFLOW;
- sbi = kzalloc(sizeof (struct jfs_sb_info), GFP_KERNEL);
+ sbi = kmalloc(sizeof (struct jfs_sb_info), GFP_KERNEL);
if (!sbi)
return -ENOSPC;
+ memset(sbi, 0, sizeof (struct jfs_sb_info));
sb->s_fs_info = sbi;
sbi->sb = sb;
- sbi->uid = sbi->gid = sbi->umask = -1;
/* initialize the mount flag and determine the default error handler */
flag = JFS_ERR_REMOUNT_RO;
}
}
-static int jfs_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data, struct vfsmount *mnt)
+static struct super_block *jfs_get_sb(struct file_system_type *fs_type,
+ int flags, const char *dev_name, void *data)
{
- return get_sb_bdev(fs_type, flags, dev_name, data, jfs_fill_super,
- mnt);
+ return get_sb_bdev(fs_type, flags, dev_name, data, jfs_fill_super);
}
static int jfs_sync_fs(struct super_block *sb, int wait)
{
struct jfs_sb_info *sbi = JFS_SBI(vfs->mnt_sb);
- if (sbi->uid != -1)
- seq_printf(seq, ",uid=%d", sbi->uid);
- if (sbi->gid != -1)
- seq_printf(seq, ",gid=%d", sbi->gid);
- if (sbi->umask != -1)
- seq_printf(seq, ",umask=%03o", sbi->umask);
if (sbi->flag & JFS_NOINTEGRITY)
seq_puts(seq, ",nointegrity");
+ else
+ seq_puts(seq, ",integrity");
-#ifdef CONFIG_QUOTA
+#if defined(CONFIG_QUOTA)
if (sbi->flag & JFS_USRQUOTA)
seq_puts(seq, ",usrquota");
return 0;
}
-#ifdef CONFIG_QUOTA
-
-/* Read data from quotafile - avoid pagecache and such because we cannot afford
- * acquiring the locks... As quota files are never truncated and quota code
- * itself serializes the operations (and noone else should touch the files)
- * we don't have to be afraid of races */
-static ssize_t jfs_quota_read(struct super_block *sb, int type, char *data,
- size_t len, loff_t off)
-{
- struct inode *inode = sb_dqopt(sb)->files[type];
- sector_t blk = off >> sb->s_blocksize_bits;
- int err = 0;
- int offset = off & (sb->s_blocksize - 1);
- int tocopy;
- size_t toread;
- struct buffer_head tmp_bh;
- struct buffer_head *bh;
- loff_t i_size = i_size_read(inode);
-
- if (off > i_size)
- return 0;
- if (off+len > i_size)
- len = i_size-off;
- toread = len;
- while (toread > 0) {
- tocopy = sb->s_blocksize - offset < toread ?
- sb->s_blocksize - offset : toread;
-
- tmp_bh.b_state = 0;
- tmp_bh.b_size = 1 << inode->i_blkbits;
- err = jfs_get_block(inode, blk, &tmp_bh, 0);
- if (err)
- return err;
- if (!buffer_mapped(&tmp_bh)) /* A hole? */
- memset(data, 0, tocopy);
- else {
- bh = sb_bread(sb, tmp_bh.b_blocknr);
- if (!bh)
- return -EIO;
- memcpy(data, bh->b_data+offset, tocopy);
- brelse(bh);
- }
- offset = 0;
- toread -= tocopy;
- data += tocopy;
- blk++;
- }
- return len;
-}
-
-/* Write to quotafile */
-static ssize_t jfs_quota_write(struct super_block *sb, int type,
- const char *data, size_t len, loff_t off)
-{
- struct inode *inode = sb_dqopt(sb)->files[type];
- sector_t blk = off >> sb->s_blocksize_bits;
- int err = 0;
- int offset = off & (sb->s_blocksize - 1);
- int tocopy;
- size_t towrite = len;
- struct buffer_head tmp_bh;
- struct buffer_head *bh;
-
- mutex_lock(&inode->i_mutex);
- while (towrite > 0) {
- tocopy = sb->s_blocksize - offset < towrite ?
- sb->s_blocksize - offset : towrite;
-
- tmp_bh.b_state = 0;
- tmp_bh.b_size = 1 << inode->i_blkbits;
- err = jfs_get_block(inode, blk, &tmp_bh, 1);
- if (err)
- goto out;
- if (offset || tocopy != sb->s_blocksize)
- bh = sb_bread(sb, tmp_bh.b_blocknr);
- else
- bh = sb_getblk(sb, tmp_bh.b_blocknr);
- if (!bh) {
- err = -EIO;
- goto out;
- }
- lock_buffer(bh);
- memcpy(bh->b_data+offset, data, tocopy);
- flush_dcache_page(bh->b_page);
- set_buffer_uptodate(bh);
- mark_buffer_dirty(bh);
- unlock_buffer(bh);
- brelse(bh);
- offset = 0;
- towrite -= tocopy;
- data += tocopy;
- blk++;
- }
-out:
- if (len == towrite)
- return err;
- if (inode->i_size < off+len-towrite)
- i_size_write(inode, off+len-towrite);
- inode->i_version++;
- inode->i_mtime = inode->i_ctime = CURRENT_TIME;
- mark_inode_dirty(inode);
- mutex_unlock(&inode->i_mutex);
- return len - towrite;
-}
-
-#endif
-
static struct super_operations jfs_super_operations = {
.alloc_inode = jfs_alloc_inode,
.destroy_inode = jfs_destroy_inode,
.unlockfs = jfs_unlockfs,
.statfs = jfs_statfs,
.remount_fs = jfs_remount,
- .show_options = jfs_show_options,
-#ifdef CONFIG_QUOTA
- .quota_read = jfs_quota_read,
- .quota_write = jfs_quota_write,
-#endif
+ .show_options = jfs_show_options
};
static struct export_operations jfs_export_operations = {
memset(jfs_ip, 0, sizeof(struct jfs_inode_info));
INIT_LIST_HEAD(&jfs_ip->anon_inode_list);
init_rwsem(&jfs_ip->rdwrlock);
- mutex_init(&jfs_ip->commit_mutex);
+ init_MUTEX(&jfs_ip->commit_sem);
init_rwsem(&jfs_ip->xattr_sem);
spin_lock_init(&jfs_ip->ag_lock);
jfs_ip->active_ag = -1;
jfs_inode_cachep =
kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
- init_once, NULL);
+ SLAB_RECLAIM_ACCOUNT, init_once, NULL);
if (jfs_inode_cachep == NULL)
return -ENOMEM;
/*
* I/O completion thread (endio)
*/
- jfsIOthread = kthread_run(jfsIOWait, NULL, "jfsIO");
- if (IS_ERR(jfsIOthread)) {
- rc = PTR_ERR(jfsIOthread);
- jfs_err("init_jfs_fs: fork failed w/rc = %d", rc);
+ jfsIOthread = kernel_thread(jfsIOWait, NULL, CLONE_KERNEL);
+ if (jfsIOthread < 0) {
+ jfs_err("init_jfs_fs: fork failed w/rc = %d", jfsIOthread);
goto end_txmngr;
}
+ wait_for_completion(&jfsIOwait); /* Wait until thread starts */
if (commit_threads < 1)
commit_threads = num_online_cpus();
commit_threads = MAX_COMMIT_THREADS;
for (i = 0; i < commit_threads; i++) {
- jfsCommitThread[i] = kthread_run(jfs_lazycommit, NULL, "jfsCommit");
- if (IS_ERR(jfsCommitThread[i])) {
- rc = PTR_ERR(jfsCommitThread[i]);
- jfs_err("init_jfs_fs: fork failed w/rc = %d", rc);
+ jfsCommitThread[i] = kernel_thread(jfs_lazycommit, NULL,
+ CLONE_KERNEL);
+ if (jfsCommitThread[i] < 0) {
+ jfs_err("init_jfs_fs: fork failed w/rc = %d",
+ jfsCommitThread[i]);
commit_threads = i;
goto kill_committask;
}
+ /* Wait until thread starts */
+ wait_for_completion(&jfsIOwait);
}
- jfsSyncThread = kthread_run(jfs_sync, NULL, "jfsSync");
- if (IS_ERR(jfsSyncThread)) {
- rc = PTR_ERR(jfsSyncThread);
- jfs_err("init_jfs_fs: fork failed w/rc = %d", rc);
+ jfsSyncThread = kernel_thread(jfs_sync, NULL, CLONE_KERNEL);
+ if (jfsSyncThread < 0) {
+ jfs_err("init_jfs_fs: fork failed w/rc = %d", jfsSyncThread);
goto kill_committask;
}
+ wait_for_completion(&jfsIOwait); /* Wait until thread starts */
#ifdef PROC_FS_JFS
jfs_proc_init();
return register_filesystem(&jfs_fs_type);
kill_committask:
+ jfs_stop_threads = 1;
+ wake_up_all(&jfs_commit_thread_wait);
for (i = 0; i < commit_threads; i++)
- kthread_stop(jfsCommitThread[i]);
- kthread_stop(jfsIOthread);
+ wait_for_completion(&jfsIOwait);
+
+ wake_up(&jfs_IO_thread_wait);
+ wait_for_completion(&jfsIOwait); /* Wait for thread exit */
end_txmngr:
txExit();
free_metapage:
jfs_info("exit_jfs_fs called");
+ jfs_stop_threads = 1;
txExit();
metapage_exit();
-
- kthread_stop(jfsIOthread);
+ wake_up(&jfs_IO_thread_wait);
+ wait_for_completion(&jfsIOwait); /* Wait until IO thread exits */
+ wake_up_all(&jfs_commit_thread_wait);
for (i = 0; i < commit_threads; i++)
- kthread_stop(jfsCommitThread[i]);
- kthread_stop(jfsSyncThread);
+ wait_for_completion(&jfsIOwait);
+ wake_up(&jfs_sync_thread_wait);
+ wait_for_completion(&jfsIOwait); /* Wait until Sync thread exits */
#ifdef PROC_FS_JFS
jfs_proc_clean();
#endif
git://git.onelab.eu / linux-2.6.git / blobdiff