Browse Source

exofs: export_operations

implement export_operations and set in superblock.
It is now posible to export exofs via nfs

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Boaz Harrosh 16 years ago
parent
commit
8cf74b3936
3 changed files with 69 additions and 0 deletions
  1. 15 0
      fs/exofs/dir.c
  2. 1 0
      fs/exofs/exofs.h
  3. 53 0
      fs/exofs/super.c

+ 15 - 0
fs/exofs/dir.c

@@ -381,6 +381,21 @@ struct exofs_dir_entry *exofs_dotdot(struct inode *dir, struct page **p)
 	return de;
 	return de;
 }
 }
 
 
+ino_t exofs_parent_ino(struct dentry *child)
+{
+	struct page *page;
+	struct exofs_dir_entry *de;
+	ino_t ino;
+
+	de = exofs_dotdot(child->d_inode, &page);
+	if (!de)
+		return 0;
+
+	ino = le64_to_cpu(de->inode_no);
+	exofs_put_page(page);
+	return ino;
+}
+
 ino_t exofs_inode_by_name(struct inode *dir, struct dentry *dentry)
 ino_t exofs_inode_by_name(struct inode *dir, struct dentry *dentry)
 {
 {
 	ino_t res = 0;
 	ino_t res = 0;

+ 1 - 0
fs/exofs/exofs.h

@@ -152,6 +152,7 @@ struct exofs_dir_entry *exofs_find_entry(struct inode *, struct dentry *,
 					 struct page **);
 					 struct page **);
 int exofs_empty_dir(struct inode *);
 int exofs_empty_dir(struct inode *);
 struct exofs_dir_entry *exofs_dotdot(struct inode *, struct page **);
 struct exofs_dir_entry *exofs_dotdot(struct inode *, struct page **);
+ino_t exofs_parent_ino(struct dentry *child);
 int exofs_set_link(struct inode *, struct exofs_dir_entry *, struct page *,
 int exofs_set_link(struct inode *, struct exofs_dir_entry *, struct page *,
 		    struct inode *);
 		    struct inode *);
 
 

+ 53 - 0
fs/exofs/super.c

@@ -37,6 +37,7 @@
 #include <linux/parser.h>
 #include <linux/parser.h>
 #include <linux/vfs.h>
 #include <linux/vfs.h>
 #include <linux/random.h>
 #include <linux/random.h>
+#include <linux/exportfs.h>
 
 
 #include "exofs.h"
 #include "exofs.h"
 
 
@@ -194,6 +195,7 @@ static void destroy_inodecache(void)
  * SUPERBLOCK FUNCTIONS
  * SUPERBLOCK FUNCTIONS
  *****************************************************************************/
  *****************************************************************************/
 static const struct super_operations exofs_sops;
 static const struct super_operations exofs_sops;
+static const struct export_operations exofs_export_ops;
 
 
 /*
 /*
  * Write the superblock to the OSD
  * Write the superblock to the OSD
@@ -358,6 +360,7 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent)
 
 
 	/* set up operation vectors */
 	/* set up operation vectors */
 	sb->s_op = &exofs_sops;
 	sb->s_op = &exofs_sops;
+	sb->s_export_op = &exofs_export_ops;
 	root = exofs_iget(sb, EXOFS_ROOT_ID - EXOFS_OBJ_OFF);
 	root = exofs_iget(sb, EXOFS_ROOT_ID - EXOFS_OBJ_OFF);
 	if (IS_ERR(root)) {
 	if (IS_ERR(root)) {
 		EXOFS_ERR("ERROR: exofs_iget failed\n");
 		EXOFS_ERR("ERROR: exofs_iget failed\n");
@@ -484,6 +487,56 @@ static const struct super_operations exofs_sops = {
 	.statfs         = exofs_statfs,
 	.statfs         = exofs_statfs,
 };
 };
 
 
+/******************************************************************************
+ * EXPORT OPERATIONS
+ *****************************************************************************/
+
+struct dentry *exofs_get_parent(struct dentry *child)
+{
+	unsigned long ino = exofs_parent_ino(child);
+
+	if (!ino)
+		return NULL;
+
+	return d_obtain_alias(exofs_iget(child->d_inode->i_sb, ino));
+}
+
+static struct inode *exofs_nfs_get_inode(struct super_block *sb,
+		u64 ino, u32 generation)
+{
+	struct inode *inode;
+
+	inode = exofs_iget(sb, ino);
+	if (IS_ERR(inode))
+		return ERR_CAST(inode);
+	if (generation && inode->i_generation != generation) {
+		/* we didn't find the right inode.. */
+		iput(inode);
+		return ERR_PTR(-ESTALE);
+	}
+	return inode;
+}
+
+static struct dentry *exofs_fh_to_dentry(struct super_block *sb,
+				struct fid *fid, int fh_len, int fh_type)
+{
+	return generic_fh_to_dentry(sb, fid, fh_len, fh_type,
+				    exofs_nfs_get_inode);
+}
+
+static struct dentry *exofs_fh_to_parent(struct super_block *sb,
+				struct fid *fid, int fh_len, int fh_type)
+{
+	return generic_fh_to_parent(sb, fid, fh_len, fh_type,
+				    exofs_nfs_get_inode);
+}
+
+static const struct export_operations exofs_export_ops = {
+	.fh_to_dentry = exofs_fh_to_dentry,
+	.fh_to_parent = exofs_fh_to_parent,
+	.get_parent = exofs_get_parent,
+};
+
 /******************************************************************************
 /******************************************************************************
  * INSMOD/RMMOD
  * INSMOD/RMMOD
  *****************************************************************************/
  *****************************************************************************/