diff options
Diffstat (limited to 'fs/9p/vfs_dentry.c')
-rw-r--r-- | fs/9p/vfs_dentry.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/fs/9p/vfs_dentry.c b/fs/9p/vfs_dentry.c index a6aa947de0f9..2dd806dac9f1 100644 --- a/fs/9p/vfs_dentry.c +++ b/fs/9p/vfs_dentry.c | |||
@@ -40,7 +40,6 @@ | |||
40 | #include "v9fs.h" | 40 | #include "v9fs.h" |
41 | #include "9p.h" | 41 | #include "9p.h" |
42 | #include "v9fs_vfs.h" | 42 | #include "v9fs_vfs.h" |
43 | #include "conv.h" | ||
44 | #include "fid.h" | 43 | #include "fid.h" |
45 | 44 | ||
46 | /** | 45 | /** |
@@ -95,24 +94,22 @@ static int v9fs_dentry_validate(struct dentry *dentry, struct nameidata *nd) | |||
95 | 94 | ||
96 | void v9fs_dentry_release(struct dentry *dentry) | 95 | void v9fs_dentry_release(struct dentry *dentry) |
97 | { | 96 | { |
97 | int err; | ||
98 | |||
98 | dprintk(DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry); | 99 | dprintk(DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry); |
99 | 100 | ||
100 | if (dentry->d_fsdata != NULL) { | 101 | if (dentry->d_fsdata != NULL) { |
101 | struct list_head *fid_list = dentry->d_fsdata; | 102 | struct list_head *fid_list = dentry->d_fsdata; |
102 | struct v9fs_fid *temp = NULL; | 103 | struct v9fs_fid *temp = NULL; |
103 | struct v9fs_fid *current_fid = NULL; | 104 | struct v9fs_fid *current_fid = NULL; |
104 | struct v9fs_fcall *fcall = NULL; | ||
105 | 105 | ||
106 | list_for_each_entry_safe(current_fid, temp, fid_list, list) { | 106 | list_for_each_entry_safe(current_fid, temp, fid_list, list) { |
107 | if (v9fs_t_clunk | 107 | err = v9fs_t_clunk(current_fid->v9ses, current_fid->fid); |
108 | (current_fid->v9ses, current_fid->fid, &fcall)) | ||
109 | dprintk(DEBUG_ERROR, "clunk failed: %s\n", | ||
110 | FCALL_ERROR(fcall)); | ||
111 | 108 | ||
112 | v9fs_put_idpool(current_fid->fid, | 109 | if (err < 0) |
113 | ¤t_fid->v9ses->fidpool); | 110 | dprintk(DEBUG_ERROR, "clunk failed: %d name %s\n", |
111 | err, dentry->d_iname); | ||
114 | 112 | ||
115 | kfree(fcall); | ||
116 | v9fs_fid_destroy(current_fid); | 113 | v9fs_fid_destroy(current_fid); |
117 | } | 114 | } |
118 | 115 | ||