[PATCH 2/6] [RFC] Create the .relink file_operation
From: Matt Helsley <hidden>
Date: 2010-09-23 21:53:28
Also in:
linux-fsdevel
Subsystem:
filesystems (vfs and infrastructure), the rest · Maintainers:
Alexander Viro, Christian Brauner, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2010-09-29 · Re: [PATCH 2/6] [RFC] Create the .relink file_operation · Oren Laadan <hidden>
- 2010-09-27 · Re: [PATCH 2/6] [RFC] Create the .relink file_operation · Brad Boyer <hidden>
- 2010-09-27 · Re: [PATCH 2/6] [RFC] Create the .relink file_operation · Matt Helsley <hidden>
- 2010-09-26 · Re: [PATCH 2/6] [RFC] Create the .relink file_operation · Brad Boyer <hidden>
Not all filesystems will necessarily be able to support relinking an orphan inode back into the filesystem. Some offlist feedback suggested that instead of overloading .link that relinking should be a separate file operation for this reason. Since .relink is a superset of .link make the VFS call .relink where possible and .link otherwise. The next commit will change ext3/4 to enable this operation. Signed-off-by: Matt Helsley <redacted> Cc: Theodore Ts'o <tytso@mit.edu> Cc: Andreas Dilger <adilger.kernel@dilger.ca> Cc: Jan Kara <jack@suse.cz> Cc: linux-fsdevel@vger.kernel.org Cc: linux-ext4@vger.kernel.org Cc: Al Viro <viro@zeniv.linux.org.uk> --- fs/namei.c | 5 ++++- include/linux/fs.h | 1 + 2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index a7dce91..eb279e3 100644
--- a/fs/namei.c
+++ b/fs/namei.c@@ -2446,7 +2446,10 @@ int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_de return error; mutex_lock(&inode->i_mutex); - error = dir->i_op->link(old_dentry, dir, new_dentry); + if (dir->i_op->relink) + error = dir->i_op->relink(old_dentry, dir, new_dentry); + else + error = dir->i_op->link(old_dentry, dir, new_dentry); mutex_unlock(&inode->i_mutex); if (!error) fsnotify_link(dir, inode, new_dentry);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index ee725ff..d932eb7 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h@@ -1528,6 +1528,7 @@ struct inode_operations { int (*create) (struct inode *,struct dentry *,int, struct nameidata *); struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *); int (*link) (struct dentry *,struct inode *,struct dentry *); + int (*relink) (struct dentry *,struct inode *,struct dentry *); int (*unlink) (struct inode *,struct dentry *); int (*symlink) (struct inode *,struct dentry *,const char *); int (*mkdir) (struct inode *,struct dentry *,int);
--
1.6.3.3