9p: use clone_fid()

Al Viro · Al Viro · commit 7d50a29fe438 · 2016-08-03T11:12:12.000-04:00
in a bunch of places it cleans the things up

Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git a/fs/9p/fid.c b/fs/9p/fid.c
@@ -257,36 +257,12 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry)
 	return v9fs_fid_lookup_with_uid(dentry, uid, any);
 }
 
-struct p9_fid *v9fs_fid_clone(struct dentry *dentry)
-{
-	struct p9_fid *fid, *ret;
-
-	fid = v9fs_fid_lookup(dentry);
-	if (IS_ERR(fid))
-		return fid;
-
-	ret = p9_client_walk(fid, 0, NULL, 1);
-	return ret;
-}
-
-static struct p9_fid *v9fs_fid_clone_with_uid(struct dentry *dentry, kuid_t uid)
-{
-	struct p9_fid *fid, *ret;
-
-	fid = v9fs_fid_lookup_with_uid(dentry, uid, 0);
-	if (IS_ERR(fid))
-		return fid;
-
-	ret = p9_client_walk(fid, 0, NULL, 1);
-	return ret;
-}
-
 struct p9_fid *v9fs_writeback_fid(struct dentry *dentry)
 {
 	int err;
 	struct p9_fid *fid;
 
-	fid = v9fs_fid_clone_with_uid(dentry, GLOBAL_ROOT_UID);
+	fid = clone_fid(v9fs_fid_lookup_with_uid(dentry, GLOBAL_ROOT_UID, 0));
 	if (IS_ERR(fid))
 		goto error_out;
 	/*
diff --git a/fs/9p/fid.h b/fs/9p/fid.h
@@ -28,11 +28,14 @@ static inline struct p9_fid *v9fs_parent_fid(struct dentry *dentry)
 {
 	return v9fs_fid_lookup(dentry->d_parent);
 }
-struct p9_fid *v9fs_fid_clone(struct dentry *dentry);
 void v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid);
 struct p9_fid *v9fs_writeback_fid(struct dentry *dentry);
 static inline struct p9_fid *clone_fid(struct p9_fid *fid)
 {
 	return IS_ERR(fid) ? fid :  p9_client_walk(fid, 0, NULL, 1);
 }
+static inline struct p9_fid *v9fs_fid_clone(struct dentry *dentry)
+{
+	return clone_fid(v9fs_fid_lookup(dentry));
+}
 #endif
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
@@ -661,7 +661,7 @@ v9fs_create(struct v9fs_session_info *v9ses, struct inode *dir,
 	}
 
 	/* clone a fid to use for creation */
-	ofid = p9_client_walk(dfid, 0, NULL, 1);
+	ofid = clone_fid(dfid);
 	if (IS_ERR(ofid)) {
 		err = PTR_ERR(ofid);
 		p9_debug(P9_DEBUG_VFS, "p9_client_walk failed %d\n", err);
diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
@@ -281,7 +281,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
 	}
 
 	/* clone a fid to use for creation */
-	ofid = p9_client_walk(dfid, 0, NULL, 1);
+	ofid = clone_fid(dfid);
 	if (IS_ERR(ofid)) {
 		err = PTR_ERR(ofid);
 		p9_debug(P9_DEBUG_VFS, "p9_client_walk failed %d\n", err);
diff --git a/fs/9p/xattr.c b/fs/9p/xattr.c
@@ -97,8 +97,6 @@ int v9fs_xattr_set(struct dentry *dentry, const char *name,
 		   const void *value, size_t value_len, int flags)
 {
 	struct p9_fid *fid = v9fs_fid_lookup(dentry);
-	if (IS_ERR(fid))
-		return PTR_ERR(fid);
 	return v9fs_fid_xattr_set(fid, name, value, value_len, flags);
 }
 
@@ -115,7 +113,7 @@ int v9fs_fid_xattr_set(struct p9_fid *fid, const char *name,
 		 name, value_len, flags);
 
 	/* Clone it */
-	fid = p9_client_walk(fid, 0, NULL, 1);
+	fid = clone_fid(fid);
 	if (IS_ERR(fid))
 		return PTR_ERR(fid);
 

Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,14 @@ static inline struct p9_fid v9fs_parent_fid(struct dentry dentry)`
`28`	`28`	`{`
`29`	`29`	`return v9fs_fid_lookup(dentry->d_parent);`
`30`	`30`	`}`
`31`		`-struct p9_fid v9fs_fid_clone(struct dentry dentry);`
`32`	`31`	`void v9fs_fid_add(struct dentry dentry, struct p9_fid fid);`
`33`	`32`	`struct p9_fid v9fs_writeback_fid(struct dentry dentry);`
`34`	`33`	`static inline struct p9_fid clone_fid(struct p9_fid fid)`
`35`	`34`	`{`
`36`	`35`	`return IS_ERR(fid) ? fid : p9_client_walk(fid, 0, NULL, 1);`
`37`	`36`	`}`
	`37`	`+static inline struct p9_fid v9fs_fid_clone(struct dentry dentry)`
	`38`	`+{`
	`39`	`+ return clone_fid(v9fs_fid_lookup(dentry));`
	`40`	`+}`
`38`	`41`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -661,7 +661,7 @@ v9fs_create(struct v9fs_session_info v9ses, struct inode dir,`
`661`	`661`	`}`
`662`	`662`
`663`	`663`	`/* clone a fid to use for creation */`
`664`		`- ofid = p9_client_walk(dfid, 0, NULL, 1);`
	`664`	`+ ofid = clone_fid(dfid);`
`665`	`665`	`if (IS_ERR(ofid)) {`
`666`	`666`	`err = PTR_ERR(ofid);`
`667`	`667`	`p9_debug(P9_DEBUG_VFS, "p9_client_walk failed %d\n", err);`
Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ v9fs_vfs_atomic_open_dotl(struct inode dir, struct dentry dentry,`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`/* clone a fid to use for creation */`
`284`		`- ofid = p9_client_walk(dfid, 0, NULL, 1);`
	`284`	`+ ofid = clone_fid(dfid);`
`285`	`285`	`if (IS_ERR(ofid)) {`
`286`	`286`	`err = PTR_ERR(ofid);`
`287`	`287`	`p9_debug(P9_DEBUG_VFS, "p9_client_walk failed %d\n", err);`
Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,6 @@ int v9fs_xattr_set(struct dentry dentry, const char name,`
`97`	`97`	`const void *value, size_t value_len, int flags)`
`98`	`98`	`{`
`99`	`99`	`struct p9_fid *fid = v9fs_fid_lookup(dentry);`
`100`		`- if (IS_ERR(fid))`
`101`		`- return PTR_ERR(fid);`
`102`	`100`	`return v9fs_fid_xattr_set(fid, name, value, value_len, flags);`
`103`	`101`	`}`
`104`	`102`
`@@ -115,7 +113,7 @@ int v9fs_fid_xattr_set(struct p9_fid fid, const char name,`
`115`	`113`	`name, value_len, flags);`
`116`	`114`
`117`	`115`	`/* Clone it */`
`118`		`- fid = p9_client_walk(fid, 0, NULL, 1);`
	`116`	`+ fid = clone_fid(fid);`
`119`	`117`	`if (IS_ERR(fid))`
`120`	`118`	`return PTR_ERR(fid);`
`121`	`119`