> @@ -54,7 +55,7 @@ static inline unsigned long hash(struct
>
> struct vfsmount *alloc_vfsmnt(const char *name)
> {
> - struct vfsmount *mnt = kmem_cache_alloc(mnt_cache, GFP_KERNEL);
> + struct vfsmount *mnt = kmem_cache_alloc(mnt_cache, GFP_KERNEL);
> if (mnt) {
> memset(mnt, 0, sizeof(struct vfsmount));
> atomic_set(&mnt->mnt_count,1);
Please make whitespace changes a separate patch.
> @@ -128,11 +162,71 @@ static void attach_mnt(struct vfsmount *
> {
> mnt->mnt_parent = mntget(nd->mnt);
> mnt->mnt_mountpoint = dget(nd->dentry);
> - list_add(&mnt->mnt_hash, mount_hashtable+hash(nd->mnt, nd->dentry));
> + mnt->mnt_namespace = nd->mnt->mnt_namespace;
> + list_add_tail(&mnt->mnt_hash,
> + mount_hashtable+hash(nd->mnt, nd->dentry));
> list_add_tail(&mnt->mnt_child, &nd->mnt->mnt_mounts);
> nd->dentry->d_mounted++;
> }
Why list_add_tail()? This changes user visible behavior, and seems
unnecessary.
> +static void attach_prepare_mnt(struct vfsmount *mnt, struct nameidata *nd)
> +{
> + mnt->mnt_parent = mntget(nd->mnt);
> + mnt->mnt_mountpoint = dget(nd->dentry);
> + nd->dentry->d_mounted++;
> +}
> +
> +
You shouldn't add unnecessary newlines. There are a lot of these,
please audit all your patches.
> +void do_attach_commit_mnt(struct vfsmount *mnt)
> +{
> + struct vfsmount *parent = mnt->mnt_parent;
> + BUG_ON(parent==mnt);
BUG_ON(parent == mnt);
> + if(list_empty(&mnt->mnt_hash))
if (list_empty(&mnt->mnt_hash))
> + list_add_tail(&mnt->mnt_hash,
> + mount_hashtable+hash(parent, mnt->mnt_mountpoint));
> + if(list_empty(&mnt->mnt_child))
> + list_add_tail(&mnt->mnt_child, &parent->mnt_mounts);
> + mnt->mnt_namespace = parent->mnt_namespace;
> + list_add_tail(&mnt->mnt_list, &mnt->mnt_namespace->list);
> +}
Etc. Maybe you should run Lindent on your changes, but be careful not
to change existing code, even if Lindent would do that!
> @@ -191,7 +270,7 @@ static void *m_start(struct seq_file *m,
> struct list_head *p;
> loff_t l = *pos;
>
> - down_read(&n->sem);
> + down_read(&namespace_sem);
> list_for_each(p, &n->list)
> if (!l--)
> return list_entry(p, struct vfsmount, mnt_list);
This should be a separate patch. You can just take the one from the
detached trees patch-series.
> +/*
> + * abort the operations done in attach_recursive_mnt(). run through the mount
> + * tree, till vfsmount 'last' and undo the changes. Ensure that all the mounts
> + * in the tree are all back in the mnt_list headed at 'source_mnt'.
> + * NOTE: This function is closely tied to the logic in
> + * 'attach_recursive_mnt()'
> + */
> +static void abort_attach_recursive_mnt(struct vfsmount *source_mnt, struct
> + vfsmount *last, struct list_head *head) { struct vfsmount *p =
> + source_mnt, *m; struct vfspnode *src_pnode;
If you want to do proper error handling, instead of doing rollback, it
seems better to first do anything that can fail (allocations), then do
the actual attaching, which cannot fail. It isn't nice to have
transient states on failure.
> + /*
> + * This operation is equivalent of mount --bind dir dir
> + * create a new mount at the dentry, and unmount all child mounts
> + * mounted on top of dentries below 'dentry', and mount them
> + * under the new mount.
> + */
> +struct vfsmount *do_make_mounted(struct vfsmount *mnt, struct dentry *dentry)
Why is this needed? I thought we agreed, that this can be removed.
Miklos
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
| |
 |