Skip to content

Commit

Permalink
constify path_get/path_put and fs_struct.c stuff
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
Al Viro committed Mar 2, 2013
1 parent 26567cd commit dcf787f
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions fs/fs_struct.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Replace the fs->{rootmnt,root} with {mnt,dentry}. Put the old values.
* It can block.
*/
void set_fs_root(struct fs_struct *fs, struct path *path)
void set_fs_root(struct fs_struct *fs, const struct path *path)
{
struct path old_root;

Expand All @@ -29,7 +29,7 @@ void set_fs_root(struct fs_struct *fs, struct path *path)
* Replace the fs->{pwdmnt,pwd} with {mnt,dentry}. Put the old values.
* It can block.
*/
void set_fs_pwd(struct fs_struct *fs, struct path *path)
void set_fs_pwd(struct fs_struct *fs, const struct path *path)
{
struct path old_pwd;

Expand All @@ -53,7 +53,7 @@ static inline int replace_path(struct path *p, const struct path *old, const str
return 1;
}

void chroot_fs_refs(struct path *old_root, struct path *new_root)
void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
{
struct task_struct *g, *p;
struct fs_struct *fs;
Expand Down
2 changes: 1 addition & 1 deletion fs/internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ extern void __mnt_drop_write_file(struct file *);
/*
* fs_struct.c
*/
extern void chroot_fs_refs(struct path *, struct path *);
extern void chroot_fs_refs(const struct path *, const struct path *);

/*
* file_table.c
Expand Down
4 changes: 2 additions & 2 deletions fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ int inode_permission(struct inode *inode, int mask)
*
* Given a path increment the reference count to the dentry and the vfsmount.
*/
void path_get(struct path *path)
void path_get(const struct path *path)
{
mntget(path->mnt);
dget(path->dentry);
Expand All @@ -464,7 +464,7 @@ EXPORT_SYMBOL(path_get);
*
* Given a path decrement the reference count to the dentry and the vfsmount.
*/
void path_put(struct path *path)
void path_put(const struct path *path)
{
dput(path->dentry);
mntput(path->mnt);
Expand Down
4 changes: 2 additions & 2 deletions include/linux/fs_struct.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ struct fs_struct {
extern struct kmem_cache *fs_cachep;

extern void exit_fs(struct task_struct *);
extern void set_fs_root(struct fs_struct *, struct path *);
extern void set_fs_pwd(struct fs_struct *, struct path *);
extern void set_fs_root(struct fs_struct *, const struct path *);
extern void set_fs_pwd(struct fs_struct *, const struct path *);
extern struct fs_struct *copy_fs_struct(struct fs_struct *);
extern void free_fs_struct(struct fs_struct *);
extern int unshare_fs_struct(void);
Expand Down
4 changes: 2 additions & 2 deletions include/linux/path.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ struct path {
struct dentry *dentry;
};

extern void path_get(struct path *);
extern void path_put(struct path *);
extern void path_get(const struct path *);
extern void path_put(const struct path *);

static inline int path_equal(const struct path *path1, const struct path *path2)
{
Expand Down

0 comments on commit dcf787f

Please sign in to comment.