diff options
author | Jan Blunck <jblunck@suse.de> | 2008-02-14 22:38:44 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 00:17:09 -0500 |
commit | cf28b4863f9ee8f122e8ff3ac0d403e07ba9c6d9 (patch) | |
tree | 65c91f6911b34c32e517938289621ce0e7baeaf3 /drivers/usb | |
parent | c32c2f63a9d6c953aaf168c0b2551da9734f76d2 (diff) |
d_path: Make d_path() use a struct path
d_path() is used on a <dentry,vfsmount> pair. Lets use a struct path to
reflect this.
[akpm@linux-foundation.org: fix build in mm/memory.c]
Signed-off-by: Jan Blunck <jblunck@suse.de>
Acked-by: Bryan Wu <bryan.wu@analog.com>
Acked-by: Christoph Hellwig <hch@infradead.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Neil Brown <neilb@suse.de>
Cc: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/gadget/file_storage.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c index 3301167d4f2a..017a196d041f 100644 --- a/drivers/usb/gadget/file_storage.c +++ b/drivers/usb/gadget/file_storage.c | |||
@@ -3563,8 +3563,7 @@ static ssize_t show_file(struct device *dev, struct device_attribute *attr, | |||
3563 | 3563 | ||
3564 | down_read(&fsg->filesem); | 3564 | down_read(&fsg->filesem); |
3565 | if (backing_file_is_open(curlun)) { // Get the complete pathname | 3565 | if (backing_file_is_open(curlun)) { // Get the complete pathname |
3566 | p = d_path(curlun->filp->f_path.dentry, | 3566 | p = d_path(&curlun->filp->f_path, buf, PAGE_SIZE - 1); |
3567 | curlun->filp->f_path.mnt, buf, PAGE_SIZE - 1); | ||
3568 | if (IS_ERR(p)) | 3567 | if (IS_ERR(p)) |
3569 | rc = PTR_ERR(p); | 3568 | rc = PTR_ERR(p); |
3570 | else { | 3569 | else { |
@@ -3981,9 +3980,8 @@ static int __init fsg_bind(struct usb_gadget *gadget) | |||
3981 | if (backing_file_is_open(curlun)) { | 3980 | if (backing_file_is_open(curlun)) { |
3982 | p = NULL; | 3981 | p = NULL; |
3983 | if (pathbuf) { | 3982 | if (pathbuf) { |
3984 | p = d_path(curlun->filp->f_path.dentry, | 3983 | p = d_path(&curlun->filp->f_path, |
3985 | curlun->filp->f_path.mnt, | 3984 | pathbuf, PATH_MAX); |
3986 | pathbuf, PATH_MAX); | ||
3987 | if (IS_ERR(p)) | 3985 | if (IS_ERR(p)) |
3988 | p = NULL; | 3986 | p = NULL; |
3989 | } | 3987 | } |