diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-14 15:37:53 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-14 15:37:53 +0800 |
| commit | fbb0b56de45bc81681eeeaec29e6c1e3ff12a200 (patch) | |
| tree | b40400c596280b6fe6b03641618bb73d196952c3 /fs/hostfs/hostfs_kern.c | |
| parent | 9d8a5571197f43541c8eec6d8d4dcd1ff4deecec (diff) | |
| parent | 19d0bd71d564448446bd851d752caf3e31520ac8 (diff) | |
Merge tag 'v3.10.100' into linux-linaro-lsk-v3.10lsk-v3.10-16.03linux-linaro-lsk-v3.10
This is the 3.10.100 stable release
Diffstat (limited to 'fs/hostfs/hostfs_kern.c')
| -rw-r--r-- | fs/hostfs/hostfs_kern.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index 32f35f187989..b58a9cbb9695 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c @@ -720,15 +720,13 @@ static int hostfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, init_special_inode(inode, mode, dev); err = do_mknod(name, mode, MAJOR(dev), MINOR(dev)); - if (!err) + if (err) goto out_free; err = read_name(inode, name); __putname(name); if (err) goto out_put; - if (err) - goto out_put; d_instantiate(dentry, inode); return 0; |