Add -p switch to "zpool get"

[zfs.git] / module / zfs / zpl_export.c

diff --git a/module/zfs/zpl_export.c b/module/zfs/zpl_export.c
index 4fe9984..94625e1 100644 (file)
--- a/module/zfs/zpl_export.c
+++ b/module/zfs/zpl_export.c
@@ -20,19 +20,26 @@
  */
 /*
  * Copyright (c) 2011 Gunnar Beutner
+ * Copyright (c) 2012 Cyril Plisko. All rights reserved.
  */
 
 
 #include <sys/zfs_vnops.h>
 #include <sys/zfs_znode.h>
+#include <sys/zfs_ctldir.h>
 #include <sys/zpl.h>
 
 
 static int
+#ifdef HAVE_ENCODE_FH_WITH_INODE
+zpl_encode_fh(struct inode *ip, __u32 *fh, int *max_len, struct inode *parent)
+{
+#else
 zpl_encode_fh(struct dentry *dentry, __u32 *fh, int *max_len, int connectable)
 {
-       fid_t *fid = (fid_t *)fh;
        struct inode *ip = dentry->d_inode;
+#endif /* HAVE_ENCODE_FH_WITH_INODE */
+       fid_t *fid = (fid_t *)fh;
        int len_bytes, rc;
 
        len_bytes = *max_len * sizeof (__u32);
@@ -42,7 +49,10 @@ zpl_encode_fh(struct dentry *dentry, __u32 *fh, int *max_len, int connectable)
 
        fid->fid_len = len_bytes - offsetof(fid_t, fid_data);
 
-       rc = zfs_fid(ip, fid);
+       if (zfsctl_is_node(ip))
+               rc = zfsctl_fid(ip, fid);
+       else
+               rc = zfs_fid(ip, fid);
 
        len_bytes = offsetof(fid_t, fid_data) + fid->fid_len;
        *max_len = roundup(len_bytes, sizeof (__u32)) / sizeof (__u32);
@@ -112,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 */
 };