diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-01 23:51:07 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-01 23:51:07 -0500 |
commit | dcf787f39162ce32ca325b3e784aba2d2444619a (patch) | |
tree | 0c9ca31625ed193558758aba2df9e127b2abd81b | |
parent | 26567cdbbf1a6b13a92a82332daee00672aa48a9 (diff) |
constify path_get/path_put and fs_struct.c stuff
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/fs_struct.c | 6 | ||||
-rw-r--r-- | fs/internal.h | 2 | ||||
-rw-r--r-- | fs/namei.c | 4 | ||||
-rw-r--r-- | include/linux/fs_struct.h | 4 | ||||
-rw-r--r-- | include/linux/path.h | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/fs/fs_struct.c b/fs/fs_struct.c index fe6ca583bbc0..d8ac61d0c932 100644 --- a/fs/fs_struct.c +++ b/fs/fs_struct.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * Replace the fs->{rootmnt,root} with {mnt,dentry}. Put the old values. | 10 | * Replace the fs->{rootmnt,root} with {mnt,dentry}. Put the old values. |
11 | * It can block. | 11 | * It can block. |
12 | */ | 12 | */ |
13 | void set_fs_root(struct fs_struct *fs, struct path *path) | 13 | void set_fs_root(struct fs_struct *fs, const struct path *path) |
14 | { | 14 | { |
15 | struct path old_root; | 15 | struct path old_root; |
16 | 16 | ||
@@ -29,7 +29,7 @@ void set_fs_root(struct fs_struct *fs, struct path *path) | |||
29 | * Replace the fs->{pwdmnt,pwd} with {mnt,dentry}. Put the old values. | 29 | * Replace the fs->{pwdmnt,pwd} with {mnt,dentry}. Put the old values. |
30 | * It can block. | 30 | * It can block. |
31 | */ | 31 | */ |
32 | void set_fs_pwd(struct fs_struct *fs, struct path *path) | 32 | void set_fs_pwd(struct fs_struct *fs, const struct path *path) |
33 | { | 33 | { |
34 | struct path old_pwd; | 34 | struct path old_pwd; |
35 | 35 | ||
@@ -53,7 +53,7 @@ static inline int replace_path(struct path *p, const struct path *old, const str | |||
53 | return 1; | 53 | return 1; |
54 | } | 54 | } |
55 | 55 | ||
56 | void chroot_fs_refs(struct path *old_root, struct path *new_root) | 56 | void chroot_fs_refs(const struct path *old_root, const struct path *new_root) |
57 | { | 57 | { |
58 | struct task_struct *g, *p; | 58 | struct task_struct *g, *p; |
59 | struct fs_struct *fs; | 59 | struct fs_struct *fs; |
diff --git a/fs/internal.h b/fs/internal.h index 2f6af7f645eb..507141fceb99 100644 --- a/fs/internal.h +++ b/fs/internal.h | |||
@@ -69,7 +69,7 @@ extern void __mnt_drop_write_file(struct file *); | |||
69 | /* | 69 | /* |
70 | * fs_struct.c | 70 | * fs_struct.c |
71 | */ | 71 | */ |
72 | extern void chroot_fs_refs(struct path *, struct path *); | 72 | extern void chroot_fs_refs(const struct path *, const struct path *); |
73 | 73 | ||
74 | /* | 74 | /* |
75 | * file_table.c | 75 | * file_table.c |
diff --git a/fs/namei.c b/fs/namei.c index dc984fee5532..961bc1268366 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -451,7 +451,7 @@ int inode_permission(struct inode *inode, int mask) | |||
451 | * | 451 | * |
452 | * Given a path increment the reference count to the dentry and the vfsmount. | 452 | * Given a path increment the reference count to the dentry and the vfsmount. |
453 | */ | 453 | */ |
454 | void path_get(struct path *path) | 454 | void path_get(const struct path *path) |
455 | { | 455 | { |
456 | mntget(path->mnt); | 456 | mntget(path->mnt); |
457 | dget(path->dentry); | 457 | dget(path->dentry); |
@@ -464,7 +464,7 @@ EXPORT_SYMBOL(path_get); | |||
464 | * | 464 | * |
465 | * Given a path decrement the reference count to the dentry and the vfsmount. | 465 | * Given a path decrement the reference count to the dentry and the vfsmount. |
466 | */ | 466 | */ |
467 | void path_put(struct path *path) | 467 | void path_put(const struct path *path) |
468 | { | 468 | { |
469 | dput(path->dentry); | 469 | dput(path->dentry); |
470 | mntput(path->mnt); | 470 | mntput(path->mnt); |
diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h index d0ae3a84bcfb..729eded4b24f 100644 --- a/include/linux/fs_struct.h +++ b/include/linux/fs_struct.h | |||
@@ -17,8 +17,8 @@ struct fs_struct { | |||
17 | extern struct kmem_cache *fs_cachep; | 17 | extern struct kmem_cache *fs_cachep; |
18 | 18 | ||
19 | extern void exit_fs(struct task_struct *); | 19 | extern void exit_fs(struct task_struct *); |
20 | extern void set_fs_root(struct fs_struct *, struct path *); | 20 | extern void set_fs_root(struct fs_struct *, const struct path *); |
21 | extern void set_fs_pwd(struct fs_struct *, struct path *); | 21 | extern void set_fs_pwd(struct fs_struct *, const struct path *); |
22 | extern struct fs_struct *copy_fs_struct(struct fs_struct *); | 22 | extern struct fs_struct *copy_fs_struct(struct fs_struct *); |
23 | extern void free_fs_struct(struct fs_struct *); | 23 | extern void free_fs_struct(struct fs_struct *); |
24 | extern int unshare_fs_struct(void); | 24 | extern int unshare_fs_struct(void); |
diff --git a/include/linux/path.h b/include/linux/path.h index edc98dec6266..d1372186f431 100644 --- a/include/linux/path.h +++ b/include/linux/path.h | |||
@@ -9,8 +9,8 @@ struct path { | |||
9 | struct dentry *dentry; | 9 | struct dentry *dentry; |
10 | }; | 10 | }; |
11 | 11 | ||
12 | extern void path_get(struct path *); | 12 | extern void path_get(const struct path *); |
13 | extern void path_put(struct path *); | 13 | extern void path_put(const struct path *); |
14 | 14 | ||
15 | static inline int path_equal(const struct path *path1, const struct path *path2) | 15 | static inline int path_equal(const struct path *path1, const struct path *path2) |
16 | { | 16 | { |