diff options
author | Jan Blunck <jblunck@suse.de> | 2008-02-14 22:38:43 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 00:17:08 -0500 |
commit | c32c2f63a9d6c953aaf168c0b2551da9734f76d2 (patch) | |
tree | 14eca3083f3de4a87a95359ab66109c10add1ae7 /fs/namespace.c | |
parent | e83aece3afad4d56cc01abe069d3519e851cd2de (diff) |
d_path: Make seq_path() use a struct path argument
seq_path() is always called with a dentry and a vfsmount from a struct path.
Make seq_path() take it directly as an argument.
Signed-off-by: Jan Blunck <jblunck@suse.de>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/namespace.c')
-rw-r--r-- | fs/namespace.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index eef57635ee07..7953c96a2071 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
@@ -408,10 +408,11 @@ static int show_vfsmnt(struct seq_file *m, void *v) | |||
408 | { 0, NULL } | 408 | { 0, NULL } |
409 | }; | 409 | }; |
410 | struct proc_fs_info *fs_infop; | 410 | struct proc_fs_info *fs_infop; |
411 | struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt }; | ||
411 | 412 | ||
412 | mangle(m, mnt->mnt_devname ? mnt->mnt_devname : "none"); | 413 | mangle(m, mnt->mnt_devname ? mnt->mnt_devname : "none"); |
413 | seq_putc(m, ' '); | 414 | seq_putc(m, ' '); |
414 | seq_path(m, mnt, mnt->mnt_root, " \t\n\\"); | 415 | seq_path(m, &mnt_path, " \t\n\\"); |
415 | seq_putc(m, ' '); | 416 | seq_putc(m, ' '); |
416 | mangle(m, mnt->mnt_sb->s_type->name); | 417 | mangle(m, mnt->mnt_sb->s_type->name); |
417 | if (mnt->mnt_sb->s_subtype && mnt->mnt_sb->s_subtype[0]) { | 418 | if (mnt->mnt_sb->s_subtype && mnt->mnt_sb->s_subtype[0]) { |
@@ -443,6 +444,7 @@ struct seq_operations mounts_op = { | |||
443 | static int show_vfsstat(struct seq_file *m, void *v) | 444 | static int show_vfsstat(struct seq_file *m, void *v) |
444 | { | 445 | { |
445 | struct vfsmount *mnt = list_entry(v, struct vfsmount, mnt_list); | 446 | struct vfsmount *mnt = list_entry(v, struct vfsmount, mnt_list); |
447 | struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt }; | ||
446 | int err = 0; | 448 | int err = 0; |
447 | 449 | ||
448 | /* device */ | 450 | /* device */ |
@@ -454,7 +456,7 @@ static int show_vfsstat(struct seq_file *m, void *v) | |||
454 | 456 | ||
455 | /* mount point */ | 457 | /* mount point */ |
456 | seq_puts(m, " mounted on "); | 458 | seq_puts(m, " mounted on "); |
457 | seq_path(m, mnt, mnt->mnt_root, " \t\n\\"); | 459 | seq_path(m, &mnt_path, " \t\n\\"); |
458 | seq_putc(m, ' '); | 460 | seq_putc(m, ' '); |
459 | 461 | ||
460 | /* file system type */ | 462 | /* file system type */ |