Merge tag 'upstream-4.4-rc1' of git://git.infradead.org/linux-ubifs

[firefly-linux-kernel-4.4.55.git] / drivers / usb / gadget / function / storage_common.c

diff --git a/drivers/usb/gadget/function/storage_common.c b/drivers/usb/gadget/function/storage_common.c
index 648f9e489b39bb3a291f091771dcd099013176db..d62683017cf3c1c052f78eb243799e1ca46ca8d5 100644 (file)
--- a/drivers/usb/gadget/function/storage_common.c
+++ b/drivers/usb/gadget/function/storage_common.c
@@ -341,7 +341,7 @@ ssize_t fsg_show_file(struct fsg_lun *curlun, struct rw_semaphore *filesem,
 
        down_read(filesem);
        if (fsg_lun_is_open(curlun)) {  /* Get the complete pathname */
-               p = d_path(&curlun->filp->f_path, buf, PAGE_SIZE - 1);
+               p = file_path(curlun->filp, buf, PAGE_SIZE - 1);
                if (IS_ERR(p))
                        rc = PTR_ERR(p);
                else {