From 393b44c7112854fc11dc97885a87f666780cc9fe Mon Sep 17 00:00:00 2001 From: Cyril Plisko Date: Sun, 16 Sep 2012 09:03:04 +0300 Subject: Implement .commit_metadata hook for NFS export In order to implement synchronous NFS metadata semantics ZFS needs to provide the .commit_metadata hook. All it takes there is to make sure changes are committed to ZIL. Fortunately zfs_fsync() does just that, so simply calling it from zpl_commit_metadata() does the trick. Signed-off-by: Brian Behlendorf Closes #969 --- module/zfs/zpl_export.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'module/zfs') diff --git a/module/zfs/zpl_export.c b/module/zfs/zpl_export.c index 395c5584c..94625e13c 100644 --- a/module/zfs/zpl_export.c +++ b/module/zfs/zpl_export.c @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2011 Gunnar Beutner + * Copyright (c) 2012 Cyril Plisko. All rights reserved. */ @@ -121,8 +122,27 @@ zpl_get_parent(struct dentry *child) return zpl_dentry_obtain_alias(ip); } +#ifdef HAVE_COMMIT_METADATA +static int +zpl_commit_metadata(struct inode *inode) +{ + cred_t *cr = CRED(); + int error; + + crhold(cr); + error = -zfs_fsync(inode, 0, cr); + crfree(cr); + ASSERT3S(error, <=, 0); + + return error; +} +#endif /* HAVE_COMMIT_METADATA */ + const struct export_operations zpl_export_operations = { .encode_fh = zpl_encode_fh, .fh_to_dentry = zpl_fh_to_dentry, - .get_parent = zpl_get_parent + .get_parent = zpl_get_parent, +#ifdef HAVE_COMMIT_METADATA + .commit_metadata= zpl_commit_metadata, +#endif /* HAVE_COMMIT_METADATA */ }; -- cgit v1.2.3