summaryrefslogtreecommitdiffstats
path: root/fs/mount.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-08-07 15:12:31 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2014-08-07 20:40:09 +0200
commit3064c3563ba4c23e2c7a47254ec056ed9ba0098a (patch)
tree806bc1df85e925686cc1075b659a6d6fe3e14aec /fs/mount.h
parentmake fs/{namespace,super}.c forget about acct.h (diff)
downloadlinux-3064c3563ba4c23e2c7a47254ec056ed9ba0098a.tar.xz
linux-3064c3563ba4c23e2c7a47254ec056ed9ba0098a.zip
death to mnt_pinned
Rather than playing silly buggers with vfsmount refcounts, just have acct_on() ask fs/namespace.c for internal clone of file->f_path.mnt and replace it with said clone. Then attach the pin to original vfsmount. Voila - the clone will be alive until the file gets closed, making sure that underlying superblock remains active, etc., and we can drop the original vfsmount, so that it's not kept busy. If the file lives until the final mntput of the original vfsmount, we'll notice that there's an fs_pin (one in bsd_acct_struct that holds that file) and mnt_pin_kill() will take it out. Since ->kill() is synchronous, we won't proceed past that point until these files are closed (and private clones of our vfsmount are gone), so we get the same ordering warranties we used to get. mnt_pin()/mnt_unpin()/->mnt_pinned is gone now, and good riddance - it never became usable outside of kernel/acct.c (and racy wrt umount even there). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/mount.h')
-rw-r--r--fs/mount.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/mount.h b/fs/mount.h
index 0a2d1458681f..6740a6215529 100644
--- a/fs/mount.h
+++ b/fs/mount.h
@@ -55,7 +55,6 @@ struct mount {
int mnt_id; /* mount identifier */
int mnt_group_id; /* peer group identifier */
int mnt_expiry_mark; /* true if marked for expiry */
- int mnt_pinned;
struct hlist_head mnt_pins;
struct path mnt_ex_mountpoint;
};