Unexport do_add_mount() and add in follow_automount(), not ->d_automount()
Unexport do_add_mount() and make ->d_automount() return the vfsmount to be added rather than calling do_add_mount() itself. follow_automount() will then do the addition. This slightly complicates things as ->d_automount() normally wants to add the new vfsmount to an expiration list and start an expiration timer. The problem with that is that the vfsmount will be deleted if it has a refcount of 1 and the timer will not repeat if the expiration list is empty. To this end, we require the vfsmount to be returned from d_automount() with a refcount of (at least) 2. One of these refs will be dropped unconditionally. In addition, follow_automount() must get a 3rd ref around the call to do_add_mount() lest it eat a ref and return an error, leaving the mount we have open to being expired as we would otherwise have only 1 ref on it. d_automount() should also add the the vfsmount to the expiration list (by calling mnt_set_expiry()) and start the expiration timer before returning, if this mechanism is to be used. The vfsmount will be unlinked from the expiration list by follow_automount() if do_add_mount() fails. This patch also fixes the call to do_add_mount() for AFS to propagate the mount flags from the parent vfsmount. Signed-off-by:David Howells <dhowells@redhat.com> Signed-off-by:
Al Viro <viro@zeniv.linux.org.uk>
Showing
- Documentation/filesystems/vfs.txt 14 additions, 9 deletionsDocumentation/filesystems/vfs.txt
- fs/afs/mntpt.c 6 additions, 19 deletionsfs/afs/mntpt.c
- fs/cifs/cifs_dfs_ref.c 6 additions, 20 deletionsfs/cifs/cifs_dfs_ref.c
- fs/internal.h 2 additions, 0 deletionsfs/internal.h
- fs/namei.c 35 additions, 7 deletionsfs/namei.c
- fs/namespace.c 33 additions, 8 deletionsfs/namespace.c
- fs/nfs/namespace.c 4 additions, 20 deletionsfs/nfs/namespace.c
- include/linux/mount.h 1 addition, 6 deletionsinclude/linux/mount.h
Loading
Please register or sign in to comment