Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 17020
b: refs/heads/master
c: d8da097
h: refs/heads/master
v: v3
  • Loading branch information
Latchesar Ionkov authored and Linus Torvalds committed Jan 9, 2006
1 parent 52e5e95 commit 2abd187
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 3cf6429a26da5c4d7b795e6d0f8f56ed2e4fdfc0
refs/heads/master: d8da097afb765654c866062148fd98b11db9003e
6 changes: 3 additions & 3 deletions trunk/fs/9p/vfs_inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -385,13 +385,14 @@ v9fs_create(struct inode *dir,
fid->iounit = iounit;
} else {
err = v9fs_t_clunk(v9ses, newfid);
newfid = -1;
if (err < 0)
dprintk(DEBUG_ERROR, "clunk for mkdir failed: %d\n", err);
}

/* walk to the newly created file and put the fid in the dentry */
wfidno = v9fs_get_idpool(&v9ses->fidpool);
if (newfid < 0) {
if (wfidno < 0) {
eprintk(KERN_WARNING, "no free fids available\n");
return -ENOSPC;
}
Expand All @@ -408,7 +409,6 @@ v9fs_create(struct inode *dir,
fcall = NULL;

if (!v9fs_fid_create(file_dentry, v9ses, wfidno, 0)) {
v9fs_t_clunk(v9ses, newfid);
v9fs_put_idpool(wfidno, &v9ses->fidpool);

goto CleanUpFid;
Expand All @@ -419,7 +419,7 @@ v9fs_create(struct inode *dir,
(perm & V9FS_DMDEVICE))
return 0;

result = v9fs_t_stat(v9ses, newfid, &fcall);
result = v9fs_t_stat(v9ses, wfidno, &fcall);
if (result < 0) {
dprintk(DEBUG_ERROR, "stat error: %s(%d)\n", FCALL_ERROR(fcall),
result);
Expand Down

0 comments on commit 2abd187

Please sign in to comment.