X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fafs%2FLINUX%2Fosi_misc.c;h=bbffb08d8134b041c62f9f5df419e87f36b19f5f;hp=adf030c653434207ea0225295a869b3e980f6e58;hb=9b0a1a9f9a7589d0097c656cb285d832ca33c591;hpb=8b921efcae07075041d90555edb2bbde56807851

diff --git a/src/afs/LINUX/osi_misc.c b/src/afs/LINUX/osi_misc.c
index adf030c..bbffb08 100644
--- a/src/afs/LINUX/osi_misc.c
+++ b/src/afs/LINUX/osi_misc.c
@@ -168,7 +168,7 @@ int osi_abspath(char *aname, char *buf, int buflen,
 		int followlink, char **pathp)
 {
     struct dentry *dp = NULL;
-    struct vfsmnt *mnt = NULL;
+    struct vfsmount *mnt = NULL;
     char *tname, *path;
     int code;
 
@@ -178,7 +178,12 @@ int osi_abspath(char *aname, char *buf, int buflen,
 	return -PTR_ERR(tname);
     code = osi_lookupname_internal(tname, followlink, &mnt, &dp);   
     if (!code) {
+#if defined(D_PATH_TAKES_STRUCT_PATH)
+	struct path p = { mnt, dp };
+	path = d_path(&p, buf, buflen);
+#else
 	path = d_path(dp, mnt, buf, buflen);
+#endif
 
 	if (IS_ERR(path)) {
 	    code = -PTR_ERR(path);