OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[XFS] move syncing related members from struct bhv_vfs to struct xfs_mount 

SGI-PV: 969608
SGI-Modid: xfs-linux-melb:xfs-kern:29508a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
This commit is contained in:
Christoph Hellwig 2007-08-30 17:21:22 +10:00 committed by Tim Shimmin
parent bd186aa901
commit 7439449670
4 changed files with 65 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
fs/xfs/linux-2.6/xfs_super.c
View File

@ -457,9 +457,9 @@ xfs_fs_clear_inode(
*/ */
STATIC void STATIC void
xfs_syncd_queue_work( xfs_syncd_queue_work(
struct bhv_vfs *vfs, struct xfs_mount *mp,
void *data, void *data,
void (*syncer)(bhv_vfs_t *, void *)) void (*syncer)(struct xfs_mount *, void *))
{ {
struct bhv_vfs_sync_work *work; struct bhv_vfs_sync_work *work;
@ -467,11 +467,11 @@ xfs_syncd_queue_work(
INIT_LIST_HEAD(&work->w_list); INIT_LIST_HEAD(&work->w_list);
work->w_syncer = syncer; work->w_syncer = syncer;
work->w_data = data; work->w_data = data;
work->w_vfs = vfs; work->w_mount = mp;
spin_lock(&vfs->vfs_sync_lock); spin_lock(&mp->m_sync_lock);
list_add_tail(&work->w_list, &vfs->vfs_sync_list); list_add_tail(&work->w_list, &mp->m_sync_list);
spin_unlock(&vfs->vfs_sync_lock); spin_unlock(&mp->m_sync_lock);
wake_up_process(vfs->vfs_sync_task); wake_up_process(mp->m_sync_task);
} }
/* /*
@ -482,22 +482,22 @@ xfs_syncd_queue_work(
*/ */
STATIC void STATIC void
xfs_flush_inode_work( xfs_flush_inode_work(
bhv_vfs_t *vfs, struct xfs_mount *mp,
void *inode) void *arg)
{ {
filemap_flush(((struct inode *)inode)->i_mapping); struct inode *inode = arg;
iput((struct inode *)inode); filemap_flush(inode->i_mapping);
iput(inode);
} }
void void
xfs_flush_inode( xfs_flush_inode(
xfs_inode_t *ip) xfs_inode_t *ip)
{ {
struct inode *inode = vn_to_inode(XFS_ITOV(ip)); struct inode *inode = ip->i_vnode;
struct bhv_vfs *vfs = XFS_MTOVFS(ip->i_mount);
igrab(inode); igrab(inode);
xfs_syncd_queue_work(vfs, inode, xfs_flush_inode_work); xfs_syncd_queue_work(ip->i_mount, inode, xfs_flush_inode_work);
delay(msecs_to_jiffies(500)); delay(msecs_to_jiffies(500));
} }
@ -507,11 +507,12 @@ xfs_flush_inode(
*/ */
STATIC void STATIC void
xfs_flush_device_work( xfs_flush_device_work(
bhv_vfs_t *vfs, struct xfs_mount *mp,
void *inode) void *arg)
{ {
sync_blockdev(vfs->vfs_super->s_bdev); struct inode *inode = arg;
iput((struct inode *)inode); sync_blockdev(mp->m_vfsp->vfs_super->s_bdev);
iput(inode);
} }
void void
@ -519,34 +520,33 @@ xfs_flush_device(
xfs_inode_t *ip) xfs_inode_t *ip)
{ {
struct inode *inode = vn_to_inode(XFS_ITOV(ip)); struct inode *inode = vn_to_inode(XFS_ITOV(ip));
struct bhv_vfs *vfs = XFS_MTOVFS(ip->i_mount);
igrab(inode); igrab(inode);
xfs_syncd_queue_work(vfs, inode, xfs_flush_device_work); xfs_syncd_queue_work(ip->i_mount, inode, xfs_flush_device_work);
delay(msecs_to_jiffies(500)); delay(msecs_to_jiffies(500));
xfs_log_force(ip->i_mount, (xfs_lsn_t)0, XFS_LOG_FORCE|XFS_LOG_SYNC); xfs_log_force(ip->i_mount, (xfs_lsn_t)0, XFS_LOG_FORCE|XFS_LOG_SYNC);
} }
STATIC void STATIC void
vfs_sync_worker( xfs_sync_worker(
bhv_vfs_t *vfsp, struct xfs_mount *mp,
void *unused) void *unused)
{ {
int error; int error;
if (!(XFS_VFSTOM(vfsp)->m_flags & XFS_MOUNT_RDONLY)) if (!(mp->m_flags & XFS_MOUNT_RDONLY))
error = xfs_sync(XFS_VFSTOM(vfsp), SYNC_FSDATA | SYNC_BDFLUSH | \ error = xfs_sync(mp, SYNC_FSDATA | SYNC_BDFLUSH | SYNC_ATTR |
SYNC_ATTR | SYNC_REFCACHE | SYNC_SUPER); SYNC_REFCACHE | SYNC_SUPER);
vfsp->vfs_sync_seq++; mp->m_sync_seq++;
wake_up(&vfsp->vfs_wait_single_sync_task); wake_up(&mp->m_wait_single_sync_task);
} }
STATIC int STATIC int
xfssyncd( xfssyncd(
void *arg) void *arg)
{ {
struct xfs_mount *mp = arg;
long timeleft; long timeleft;
bhv_vfs_t *vfsp = (bhv_vfs_t *) arg;
bhv_vfs_sync_work_t *work, *n; bhv_vfs_sync_work_t *work, *n;
LIST_HEAD (tmp); LIST_HEAD (tmp);
@ -556,31 +556,31 @@ xfssyncd(
timeleft = schedule_timeout_interruptible(timeleft); timeleft = schedule_timeout_interruptible(timeleft);
/* swsusp */ /* swsusp */
try_to_freeze(); try_to_freeze();
if (kthread_should_stop() && list_empty(&vfsp->vfs_sync_list)) if (kthread_should_stop() && list_empty(&mp->m_sync_list))
break; break;
spin_lock(&vfsp->vfs_sync_lock); spin_lock(&mp->m_sync_lock);
/* /*
* We can get woken by laptop mode, to do a sync - * We can get woken by laptop mode, to do a sync -
* that's the (only!) case where the list would be * that's the (only!) case where the list would be
* empty with time remaining. * empty with time remaining.
*/ */
if (!timeleft || list_empty(&vfsp->vfs_sync_list)) { if (!timeleft || list_empty(&mp->m_sync_list)) {
if (!timeleft) if (!timeleft)
timeleft = xfs_syncd_centisecs * timeleft = xfs_syncd_centisecs *
msecs_to_jiffies(10); msecs_to_jiffies(10);
INIT_LIST_HEAD(&vfsp->vfs_sync_work.w_list); INIT_LIST_HEAD(&mp->m_sync_work.w_list);
list_add_tail(&vfsp->vfs_sync_work.w_list, list_add_tail(&mp->m_sync_work.w_list,
&vfsp->vfs_sync_list); &mp->m_sync_list);
} }
list_for_each_entry_safe(work, n, &vfsp->vfs_sync_list, w_list) list_for_each_entry_safe(work, n, &mp->m_sync_list, w_list)
list_move(&work->w_list, &tmp); list_move(&work->w_list, &tmp);
spin_unlock(&vfsp->vfs_sync_lock); spin_unlock(&mp->m_sync_lock);
list_for_each_entry_safe(work, n, &tmp, w_list) { list_for_each_entry_safe(work, n, &tmp, w_list) {
(*work->w_syncer)(vfsp, work->w_data); (*work->w_syncer)(mp, work->w_data);
list_del(&work->w_list); list_del(&work->w_list);
if (work == &vfsp->vfs_sync_work) if (work == &mp->m_sync_work)
continue; continue;
kmem_free(work, sizeof(struct bhv_vfs_sync_work)); kmem_free(work, sizeof(struct bhv_vfs_sync_work));
} }
@ -589,25 +589,6 @@ xfssyncd(
return 0; return 0;
} }
STATIC int
xfs_fs_start_syncd(
bhv_vfs_t *vfsp)
{
vfsp->vfs_sync_work.w_syncer = vfs_sync_worker;
vfsp->vfs_sync_work.w_vfs = vfsp;
vfsp->vfs_sync_task = kthread_run(xfssyncd, vfsp, "xfssyncd");
if (IS_ERR(vfsp->vfs_sync_task))
return -PTR_ERR(vfsp->vfs_sync_task);
return 0;
}
STATIC void
xfs_fs_stop_syncd(
bhv_vfs_t *vfsp)
{
kthread_stop(vfsp->vfs_sync_task);
}
STATIC void STATIC void
xfs_fs_put_super( xfs_fs_put_super(
struct super_block *sb) struct super_block *sb)
@ -616,7 +597,8 @@ xfs_fs_put_super(
struct xfs_mount *mp = XFS_M(sb); struct xfs_mount *mp = XFS_M(sb);
int error; int error;
xfs_fs_stop_syncd(vfsp); kthread_stop(mp->m_sync_task);
xfs_sync(mp, SYNC_ATTR | SYNC_DELWRI); xfs_sync(mp, SYNC_ATTR | SYNC_DELWRI);
error = xfs_unmount(mp, 0, NULL); error = xfs_unmount(mp, 0, NULL);
if (error) { if (error) {
@ -641,7 +623,6 @@ xfs_fs_sync_super(
struct super_block *sb, struct super_block *sb,
int wait) int wait)
{ {
bhv_vfs_t *vfsp = vfs_from_sb(sb);
struct xfs_mount *mp = XFS_M(sb); struct xfs_mount *mp = XFS_M(sb);
int error; int error;
int flags; int flags;
@ -663,22 +644,22 @@ xfs_fs_sync_super(
sb->s_dirt = 0; sb->s_dirt = 0;
if (unlikely(laptop_mode)) { if (unlikely(laptop_mode)) {
int prev_sync_seq = vfsp->vfs_sync_seq; int prev_sync_seq = mp->m_sync_seq;
/* /*
* The disk must be active because we're syncing. * The disk must be active because we're syncing.
* We schedule xfssyncd now (now that the disk is * We schedule xfssyncd now (now that the disk is
* active) instead of later (when it might not be). * active) instead of later (when it might not be).
*/ */
wake_up_process(vfsp->vfs_sync_task); wake_up_process(mp->m_sync_task);
/* /*
* We have to wait for the sync iteration to complete. * We have to wait for the sync iteration to complete.
* If we don't, the disk activity caused by the sync * If we don't, the disk activity caused by the sync
* will come after the sync is completed, and that * will come after the sync is completed, and that
* triggers another sync from laptop mode. * triggers another sync from laptop mode.
*/ */
wait_event(vfsp->vfs_wait_single_sync_task, wait_event(mp->m_wait_single_sync_task,
vfsp->vfs_sync_seq != prev_sync_seq); mp->m_sync_seq != prev_sync_seq);
} }
return -error; return -error;
@ -790,6 +771,11 @@ xfs_fs_fill_super(
int error; int error;
mp = xfs_mount_init(); mp = xfs_mount_init();
INIT_LIST_HEAD(&mp->m_sync_list);
spin_lock_init(&mp->m_sync_lock);
init_waitqueue_head(&mp->m_wait_single_sync_task);
mp->m_vfsp = vfsp; mp->m_vfsp = vfsp;
vfsp->vfs_mount = mp; vfsp->vfs_mount = mp;
@ -834,8 +820,15 @@ xfs_fs_fill_super(
error = EINVAL; error = EINVAL;
goto fail_vnrele; goto fail_vnrele;
} }
if ((error = xfs_fs_start_syncd(vfsp)))
mp->m_sync_work.w_syncer = xfs_sync_worker;
mp->m_sync_work.w_mount = mp;
mp->m_sync_task = kthread_run(xfssyncd, mp, "xfssyncd");
if (IS_ERR(mp->m_sync_task)) {
error = -PTR_ERR(mp->m_sync_task);
goto fail_vnrele; goto fail_vnrele;
}
vn_trace_exit(XFS_I(sb->s_root->d_inode), __FUNCTION__, vn_trace_exit(XFS_I(sb->s_root->d_inode), __FUNCTION__,
(inst_t *)__return_address); (inst_t *)__return_address);

3
fs/xfs/linux-2.6/xfs_vfs.c
View File

@ -204,9 +204,6 @@ vfs_allocate(
struct bhv_vfs *vfsp; struct bhv_vfs *vfsp;
vfsp = kmem_zalloc(sizeof(bhv_vfs_t), KM_SLEEP); vfsp = kmem_zalloc(sizeof(bhv_vfs_t), KM_SLEEP);
INIT_LIST_HEAD(&vfsp->vfs_sync_list);
spin_lock_init(&vfsp->vfs_sync_lock);
init_waitqueue_head(&vfsp->vfs_wait_single_sync_task);
vfsp->vfs_super = sb; vfsp->vfs_super = sb;
sb->s_fs_info = vfsp; sb->s_fs_info = vfsp;

10
fs/xfs/linux-2.6/xfs_vfs.h
View File

@ -36,20 +36,14 @@ typedef struct kstatfs bhv_statvfs_t;
typedef struct bhv_vfs_sync_work { typedef struct bhv_vfs_sync_work {
struct list_head w_list; struct list_head w_list;
struct bhv_vfs *w_vfs; struct xfs_mount *w_mount;
void *w_data; /* syncer routine argument */ void *w_data; /* syncer routine argument */
void (*w_syncer)(struct bhv_vfs *, void *); void (*w_syncer)(struct xfs_mount *, void *);
} bhv_vfs_sync_work_t; } bhv_vfs_sync_work_t;
typedef struct bhv_vfs { typedef struct bhv_vfs {
struct xfs_mount *vfs_mount; struct xfs_mount *vfs_mount;
struct super_block *vfs_super; /* generic superblock pointer */ struct super_block *vfs_super; /* generic superblock pointer */
struct task_struct *vfs_sync_task; /* generalised sync thread */
bhv_vfs_sync_work_t vfs_sync_work; /* work item for VFS_SYNC */
struct list_head vfs_sync_list; /* sync thread work item list */
spinlock_t vfs_sync_lock; /* work item list lock */
int vfs_sync_seq; /* sync thread generation no. */
wait_queue_head_t vfs_wait_single_sync_task;
} bhv_vfs_t; } bhv_vfs_t;
#define SYNC_ATTR 0x0001 /* sync attributes */ #define SYNC_ATTR 0x0001 /* sync attributes */

6
fs/xfs/xfs_mount.h
View File

@ -433,6 +433,12 @@ typedef struct xfs_mount {
struct mutex m_icsb_mutex; /* balancer sync lock */ struct mutex m_icsb_mutex; /* balancer sync lock */
#endif #endif
struct xfs_mru_cache *m_filestream; /* per-mount filestream data */ struct xfs_mru_cache *m_filestream; /* per-mount filestream data */
struct task_struct *m_sync_task; /* generalised sync thread */
bhv_vfs_sync_work_t m_sync_work; /* work item for VFS_SYNC */
struct list_head m_sync_list; /* sync thread work item list */
spinlock_t m_sync_lock; /* work item list lock */
int m_sync_seq; /* sync thread generation no. */
wait_queue_head_t m_wait_single_sync_task;
} xfs_mount_t; } xfs_mount_t;
/* /*