summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorYuxuan Shui <[email protected]>2012-10-11 22:41:33 +0800
committerBrian Behlendorf <[email protected]>2012-10-14 16:26:21 -0700
commitbcb15891ab394e11615eee08bba1fd85ac32e158 (patch)
treeae6bc520ef7ce3210d1556229a28e5676299c06e /include
parentdea3505dff1252b337eb1cb8744626fb0f796d86 (diff)
Linux 3.6 compat, kern_path_locked() added
The kern_path_parent() function was removed from Linux 3.6 because it was observed that all the callers just want the parent dentry. The simpler kern_path_locked() function replaces kern_path_parent() and does the lookup while holding the ->i_mutex lock. This is good news for the vn implementation because it removes the need for us to handle the locking. However, it makes it harder to implement a single readable vn_remove()/vn_rename() function which is usually what we prefer. Therefore, we implement a new version of vn_remove()/vn_rename() for Linux 3.6 and newer kernels. This allows us to leave the existing working implementation untouched, and to add a simpler version for newer kernels. Long term I would very much like to see all of the vn code removed since what this code enabled is generally frowned upon in the kernel. But that can't happen util we either abondon the zpool.cache file or implement alternate infrastructure to update is correctly in user space. Signed-off-by: Yuxuan Shui <[email protected]> Signed-off-by: Richard Yao <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #154
Diffstat (limited to 'include')
-rw-r--r--include/linux/file_compat.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/file_compat.h b/include/linux/file_compat.h
index 2b5b7d225..27819d5e5 100644
--- a/include/linux/file_compat.h
+++ b/include/linux/file_compat.h
@@ -83,6 +83,12 @@ extern kern_path_parent_t kern_path_parent_fn;
# define spl_kern_path_parent(path, nd) path_lookup(path, LOOKUP_PARENT, nd)
#endif /* HAVE_KERN_PATH_PARENT_HEADER */
+#ifdef HAVE_KERN_PATH_LOCKED
+typedef struct dentry * (*kern_path_locked_t)(const char *, struct path *);
+extern kern_path_locked_t kern_path_locked_fn;
+# define spl_kern_path_locked(name, path) kern_path_locked_fn(name, path)
+#endif /* HAVE_KERN_PATH_LOCKED */
+
#ifndef HAVE_CLEAR_CLOSE_ON_EXEC
#define __clear_close_on_exec(fd, fdt) FD_CLR(fd, fdt->close_on_exec)
#endif