aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/internal.h2
-rw-r--r--include/linux/mount.h2
-rw-r--r--kernel/acct.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/internal.h b/fs/internal.h
index 6a8b71643af4..2e7362837a6e 100644
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -89,9 +89,7 @@ extern int sb_prepare_remount_readonly(struct super_block *);
89 89
90extern void __init mnt_init(void); 90extern void __init mnt_init(void);
91 91
92extern int __mnt_want_write(struct vfsmount *);
93extern int __mnt_want_write_file(struct file *); 92extern int __mnt_want_write_file(struct file *);
94extern void __mnt_drop_write(struct vfsmount *);
95extern void __mnt_drop_write_file(struct file *); 93extern void __mnt_drop_write_file(struct file *);
96 94
97/* 95/*
diff --git a/include/linux/mount.h b/include/linux/mount.h
index 9197ddbf35fb..bf8cc4108b8f 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -87,6 +87,8 @@ extern bool mnt_may_suid(struct vfsmount *mnt);
87 87
88struct path; 88struct path;
89extern struct vfsmount *clone_private_mount(const struct path *path); 89extern struct vfsmount *clone_private_mount(const struct path *path);
90extern int __mnt_want_write(struct vfsmount *);
91extern void __mnt_drop_write(struct vfsmount *);
90 92
91struct file_system_type; 93struct file_system_type;
92extern struct vfsmount *fc_mount(struct fs_context *fc); 94extern struct vfsmount *fc_mount(struct fs_context *fc);
diff --git a/kernel/acct.c b/kernel/acct.c
index addf7732fb56..81f9831a7859 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -227,7 +227,7 @@ static int acct_on(struct filename *pathname)
227 filp_close(file, NULL); 227 filp_close(file, NULL);
228 return PTR_ERR(internal); 228 return PTR_ERR(internal);
229 } 229 }
230 err = mnt_want_write(internal); 230 err = __mnt_want_write(internal);
231 if (err) { 231 if (err) {
232 mntput(internal); 232 mntput(internal);
233 kfree(acct); 233 kfree(acct);
@@ -252,7 +252,7 @@ static int acct_on(struct filename *pathname)
252 old = xchg(&ns->bacct, &acct->pin); 252 old = xchg(&ns->bacct, &acct->pin);
253 mutex_unlock(&acct->lock); 253 mutex_unlock(&acct->lock);
254 pin_kill(old); 254 pin_kill(old);
255 mnt_drop_write(mnt); 255 __mnt_drop_write(mnt);
256 mntput(mnt); 256 mntput(mnt);
257 return 0; 257 return 0;
258} 258}