Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Register .sync_fs handler 

Register the missing .sync_fs handler.  This is a noop in most cases
because the usual requirement is that sync just be initiated.  As part
of the DMU's normal transaction processing txgs will be frequently
synced.  However, when the 'wait' flag is set the requirement is that
.sync_fs must not return until the data is safe on disk.  With the
addition of the .sync_fs handler this is now properly implemented.
This commit is contained in:
Brian Behlendorf 2011-03-15 12:03:42 -07:00
parent 3aff775555
commit 03f9ba9d99
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sys/zfs_znode.h
View File

@ -323,7 +323,7 @@ extern void zfs_zinactive(znode_t *);
extern void zfs_znode_delete(znode_t *, dmu_tx_t *);
extern void zfs_remove_op_tables(void);
extern int zfs_create_op_tables(void);
extern int zfs_sync(zfs_sb_t *, short, cred_t *);
extern int zfs_sync(struct super_block *, int, cred_t *);
extern dev_t zfs_cmpldev(uint64_t);
extern int zfs_get_zplprop(objset_t *os, zfs_prop_t prop, uint64_t *value);
extern int zfs_get_stats(objset_t *os, nvlist_t *nv);

18
module/zfs/zfs_vfsops.c
View File

@ -69,8 +69,10 @@
/*ARGSUSED*/
int
zfs_sync(zfs_sb_t *zsb, short flag, cred_t *cr)
zfs_sync(struct super_block *sb, int wait, cred_t *cr)
{
zfs_sb_t *zsb = sb->s_fs_info;
/*
* Data integrity is job one. We don't want a compromised kernel
* writing to the storage pool, so we never sync during panic.
@ -78,6 +80,13 @@ zfs_sync(zfs_sb_t *zsb, short flag, cred_t *cr)
if (unlikely(oops_in_progress))
return (0);
/*
* Semantically, the only requirement is that the sync be initiated.
* The DMU syncs out txgs frequently, so there's nothing to do.
*/
if (!wait)
return (0);
if (zsb != NULL) {
/*
* Sync a specific filesystem.
@ -87,19 +96,14 @@ zfs_sync(zfs_sb_t *zsb, short flag, cred_t *cr)
ZFS_ENTER(zsb);
dp = dmu_objset_pool(zsb->z_os);
#ifdef HAVE_SHUTDOWN
/*
* If the system is shutting down, then skip any
* filesystems which may exist on a suspended pool.
*
* XXX: This can be implemented using the Linux reboot
* notifiers: {un}register_reboot_notifier().
*/
if (sys_shutdown && spa_suspended(dp->dp_spa)) {
if (spa_suspended(dp->dp_spa)) {
ZFS_EXIT(zsb);
return (0);
}
#endif /* HAVE_SHUTDOWN */
if (zsb->z_log != NULL)
zil_commit(zsb->z_log, 0);

16
module/zfs/zpl_super.c
View File

@ -104,6 +104,20 @@ zpl_put_super(struct super_block *sb)
ASSERT3S(error, <=, 0);
}
static int
zpl_sync_fs(struct super_block *sb, int wait)
{
cred_t *cr;
int error;
cr = (cred_t *)get_current_cred();
error = -zfs_sync(sb, wait, cr);
put_cred(cr);
ASSERT3S(error, <=, 0);
return (error);
}
static int
zpl_statfs(struct dentry *dentry, struct kstatfs *statp)
{
@ -179,7 +193,7 @@ const struct super_operations zpl_super_operations = {
#endif /* HAVE_EVICT_INODE */
.put_super = zpl_put_super,
.write_super = NULL,
.sync_fs = NULL,
.sync_fs = zpl_sync_fs,
.freeze_fs = NULL,
.unfreeze_fs = NULL,
.statfs = zpl_statfs,