vfs: change d_canonical_path to take two paths

bug: 23904372
Change-Id: I4a686d64b6de37decf60019be1718e1d820193e6
Signed-off-by: Daniel Rosenberg <drosen@google.com>

diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 32f57fa4f4fdbf090f61b3841c2692590dd57332..941e59d7ffe7f86eb20bed7f9b6ec8a8929cf81d 100644 (file)
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -770,7 +770,7 @@ SYSCALL_DEFINE3(inotify_add_watch, int, fd, const char __user *, pathname,
        /* support stacked filesystems */
        if(path.dentry && path.dentry->d_op) {
                if (path.dentry->d_op->d_canonical_path) {
-                       path.dentry->d_op->d_canonical_path(path.dentry, &alteredpath);
+                       path.dentry->d_op->d_canonical_path(&path, &alteredpath);
                        canonical_path = &alteredpath;
                        path_put(&path);
                }

diff --git a/fs/sdcardfs/dentry.c b/fs/sdcardfs/dentry.c
index c8f3bcbfb183bfb2af1200b7da03b8917ab775ff..5f35c4cb31d05a44381391cc96e05efb8ca3bd22 100644 (file)
--- a/fs/sdcardfs/dentry.c
+++ b/fs/sdcardfs/dentry.c
@@ -179,9 +179,7 @@ static int sdcardfs_cmp_ci(const struct dentry *parent,
        return 1;
 }
 
-static void sdcardfs_canonical_path(const struct path *path,
-                               struct path *actual_path)
-{
+static void sdcardfs_canonical_path(const struct path *path, struct path *actual_path) {
        sdcardfs_get_real_lower(path->dentry, actual_path);
 }
 

diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 22c77df4001fc3388cfb8d72996393230c30080b..0ab0ed8bdaa2d186d018ba9952623a65e2f7a8b2 100644 (file)
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -158,7 +158,7 @@ struct dentry_operations {
        char *(*d_dname)(struct dentry *, char *, int);
        struct vfsmount *(*d_automount)(struct path *);
        int (*d_manage)(struct dentry *, bool);
-       void (*d_canonical_path)(const struct dentry *, struct path *);
+       void (*d_canonical_path)(const struct path *, struct path *);
 } ____cacheline_aligned;
 
 /*