diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 12:01:42 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 12:01:42 -0400 |
| commit | 8626e4a42675ff9903f7d4fbf14d8ebc11b5926c (patch) | |
| tree | c631dfe2854cb1382a5d8f5aa11b071762ddf27d /fs/pnode.c | |
| parent | a8d8f02cf0c379693762107afe812b9e52090e39 (diff) | |
| parent | 9249e17fe094d853d1ef7475dd559a2cc7e23d42 (diff) | |
Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6
Resolve conflicts with the VFS atomic open and sget changes.
Conflicts:
fs/nfs/nfs4proc.c
Diffstat (limited to 'fs/pnode.c')
| -rw-r--r-- | fs/pnode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/pnode.c b/fs/pnode.c index bed378db0758..3e000a51ac0d 100644 --- a/fs/pnode.c +++ b/fs/pnode.c | |||
| @@ -237,8 +237,9 @@ int propagate_mnt(struct mount *dest_mnt, struct dentry *dest_dentry, | |||
| 237 | 237 | ||
| 238 | source = get_source(m, prev_dest_mnt, prev_src_mnt, &type); | 238 | source = get_source(m, prev_dest_mnt, prev_src_mnt, &type); |
| 239 | 239 | ||
| 240 | if (!(child = copy_tree(source, source->mnt.mnt_root, type))) { | 240 | child = copy_tree(source, source->mnt.mnt_root, type); |
| 241 | ret = -ENOMEM; | 241 | if (IS_ERR(child)) { |
| 242 | ret = PTR_ERR(child); | ||
| 242 | list_splice(tree_list, tmp_list.prev); | 243 | list_splice(tree_list, tmp_list.prev); |
| 243 | goto out; | 244 | goto out; |
| 244 | } | 245 | } |