diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-14 21:37:05 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-14 21:37:05 -0400 |
| commit | 0d1d392f011b284bb4af0411b2d36e5d04e0f058 (patch) | |
| tree | 081f99182bde3cc8af49b80b4e9df7d95476e8ed /fs/namespace.c | |
| parent | fa180eb448fa263cf18dd930143b515d27d70d7b (diff) | |
| parent | 41ef2d5678d83af030125550329b6ae8b74618fa (diff) | |
Merge 3.9-rc7 into driver-core-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/namespace.c')
| -rw-r--r-- | fs/namespace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index d581e45c0a9f..341d3f564082 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
| @@ -1690,7 +1690,7 @@ static int do_loopback(struct path *path, const char *old_name, | |||
| 1690 | 1690 | ||
| 1691 | if (IS_ERR(mnt)) { | 1691 | if (IS_ERR(mnt)) { |
| 1692 | err = PTR_ERR(mnt); | 1692 | err = PTR_ERR(mnt); |
| 1693 | goto out; | 1693 | goto out2; |
| 1694 | } | 1694 | } |
| 1695 | 1695 | ||
| 1696 | err = graft_tree(mnt, path); | 1696 | err = graft_tree(mnt, path); |