[overlayfs] Fixes against ubuntu-quantal.git#master-next

[Sedat Dilek]

On Sat, Apr 28, 2012 at 1:59 PM, Sedat Dilek <sedat.dilek at googlemail.com> wrote:
> Hi,
>
> I wanted to play with OverlayFS against Linux-3.4-rc4.
>
> As Ubuntu kernel-team has rebased it in ubuntu-quantal.git#master-next.
> I made my life easy and took this repo as base for my fixes (or trying to fix).
>
> [2] says:
> UBUNTU: [Config] Temporarily disable overlayfs
> Fails to build after rebase to v3.4-rc1
>
> So, I tried to fix that myself.
> OK, ovl compiles here, but when I try to follow the testcase in [1], I
> get call-traces in mnt_want_write().
> Not sure if I borked more than I fixed it up.
>
> Any comments welcome!
> Thanks.
>
> Kind regards,
> - Sedat -
>
> [1] http://kernel.ubuntu.com/git?p=ubuntu/ubuntu-quantal.git;a=shortlog;h=refs/heads/master-next
> [2] http://kernel.ubuntu.com/git?p=ubuntu/ubuntu-quantal.git;a=commit;h=17be56b59c8535ab835befa9555078687305bc76
> [3] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/944386

Grrr..., followup to d_make_root() fix.

$ git diff fs/overlayfs/super.c
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index 36e254d..6137475 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -626,8 +626,6 @@ out_put_lowerpath:
        path_put(&lowerpath);
 out_put_upperpath:
        path_put(&upperpath);
-out_put_root:
-       iput(root_inode);
 out_free_oe:
        kfree(oe);
 out_free_config:

- Sedat -