Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197933
b: refs/heads/master
c: 8946807
h: refs/heads/master
i:
  197931: 376e159
v: v3
  • Loading branch information
Al Viro committed May 21, 2010
1 parent 8b3737c commit d7fe3c0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a135aa2cd76a1de1a84312e0bb3498a5da76782d
refs/heads/master: 894680710d813137077ad7cb351b713f64cabbdf
9 changes: 3 additions & 6 deletions trunk/fs/devpts/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -384,18 +384,15 @@ static int devpts_get_sb(struct file_system_type *fs_type,
s->s_flags |= MS_ACTIVE;
}

simple_set_mnt(mnt, s);

memcpy(&(DEVPTS_SB(s))->mount_opts, &opts, sizeof(opts));

error = mknod_ptmx(s);
if (error)
goto out_dput;
goto out_undo_sget;

return 0;
simple_set_mnt(mnt, s);

out_dput:
dput(s->s_root); /* undo dget() in simple_set_mnt() */
return 0;

out_undo_sget:
deactivate_locked_super(s);
Expand Down

0 comments on commit d7fe3c0

Please sign in to comment.