diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-28 01:18:14 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-28 01:18:14 -0500 |
commit | 2ea03e1d62d56c37737e43550c360b43a5e40a32 (patch) | |
tree | a95494fbf887da9450e4b3feaac18b0f60f838cc /fs/9p/vfs_inode.c | |
parent | aaeb7ecfb48ad4c8942a26874322d8918524a04f (diff) |
9p: v9fs_fid_add() can't fail now
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/9p/vfs_inode.c')
-rw-r--r-- | fs/9p/vfs_inode.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index b5340c829de1..ce601d71a427 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c | |||
@@ -692,9 +692,7 @@ v9fs_create(struct v9fs_session_info *v9ses, struct inode *dir, | |||
692 | "inode creation failed %d\n", err); | 692 | "inode creation failed %d\n", err); |
693 | goto error; | 693 | goto error; |
694 | } | 694 | } |
695 | err = v9fs_fid_add(dentry, fid); | 695 | v9fs_fid_add(dentry, fid); |
696 | if (err < 0) | ||
697 | goto error; | ||
698 | d_instantiate(dentry, inode); | 696 | d_instantiate(dentry, inode); |
699 | } | 697 | } |
700 | return ofid; | 698 | return ofid; |
@@ -830,9 +828,7 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry, | |||
830 | inode = NULL; | 828 | inode = NULL; |
831 | goto error; | 829 | goto error; |
832 | } | 830 | } |
833 | result = v9fs_fid_add(dentry, fid); | 831 | v9fs_fid_add(dentry, fid); |
834 | if (result < 0) | ||
835 | goto error_iput; | ||
836 | inst_out: | 832 | inst_out: |
837 | /* | 833 | /* |
838 | * If we had a rename on the server and a parallel lookup | 834 | * If we had a rename on the server and a parallel lookup |
@@ -845,7 +841,6 @@ inst_out: | |||
845 | if (!IS_ERR(res)) | 841 | if (!IS_ERR(res)) |
846 | return res; | 842 | return res; |
847 | result = PTR_ERR(res); | 843 | result = PTR_ERR(res); |
848 | error_iput: | ||
849 | iput(inode); | 844 | iput(inode); |
850 | error: | 845 | error: |
851 | p9_client_clunk(fid); | 846 | p9_client_clunk(fid); |