aboutsummaryrefslogtreecommitdiffstats
path: root/fs/coda/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/coda/inode.c')
-rw-r--r--fs/coda/inode.c29
1 files changed, 15 insertions, 14 deletions
diff --git a/fs/coda/inode.c b/fs/coda/inode.c
index d9c7751f10ac..b87d49fea623 100644
--- a/fs/coda/inode.c
+++ b/fs/coda/inode.c
@@ -119,12 +119,12 @@ static int get_device_index(struct coda_mount_data *data)
119 int idx; 119 int idx;
120 120
121 if (data == NULL) { 121 if (data == NULL) {
122 printk("coda_read_super: Bad mount data\n"); 122 pr_warn("coda_read_super: Bad mount data\n");
123 return -1; 123 return -1;
124 } 124 }
125 125
126 if (data->version != CODA_MOUNT_VERSION) { 126 if (data->version != CODA_MOUNT_VERSION) {
127 printk("coda_read_super: Bad mount version\n"); 127 pr_warn("coda_read_super: Bad mount version\n");
128 return -1; 128 return -1;
129 } 129 }
130 130
@@ -141,13 +141,13 @@ static int get_device_index(struct coda_mount_data *data)
141 fdput(f); 141 fdput(f);
142 142
143 if (idx < 0 || idx >= MAX_CODADEVS) { 143 if (idx < 0 || idx >= MAX_CODADEVS) {
144 printk("coda_read_super: Bad minor number\n"); 144 pr_warn("coda_read_super: Bad minor number\n");
145 return -1; 145 return -1;
146 } 146 }
147 147
148 return idx; 148 return idx;
149Ebadf: 149Ebadf:
150 printk("coda_read_super: Bad file\n"); 150 pr_warn("coda_read_super: Bad file\n");
151 return -1; 151 return -1;
152} 152}
153 153
@@ -168,19 +168,19 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
168 if(idx == -1) 168 if(idx == -1)
169 idx = 0; 169 idx = 0;
170 170
171 printk(KERN_INFO "coda_read_super: device index: %i\n", idx); 171 pr_info("coda_read_super: device index: %i\n", idx);
172 172
173 vc = &coda_comms[idx]; 173 vc = &coda_comms[idx];
174 mutex_lock(&vc->vc_mutex); 174 mutex_lock(&vc->vc_mutex);
175 175
176 if (!vc->vc_inuse) { 176 if (!vc->vc_inuse) {
177 printk("coda_read_super: No pseudo device\n"); 177 pr_warn("coda_read_super: No pseudo device\n");
178 error = -EINVAL; 178 error = -EINVAL;
179 goto unlock_out; 179 goto unlock_out;
180 } 180 }
181 181
182 if (vc->vc_sb) { 182 if (vc->vc_sb) {
183 printk("coda_read_super: Device already mounted\n"); 183 pr_warn("coda_read_super: Device already mounted\n");
184 error = -EBUSY; 184 error = -EBUSY;
185 goto unlock_out; 185 goto unlock_out;
186 } 186 }
@@ -204,22 +204,23 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
204 /* get root fid from Venus: this needs the root inode */ 204 /* get root fid from Venus: this needs the root inode */
205 error = venus_rootfid(sb, &fid); 205 error = venus_rootfid(sb, &fid);
206 if ( error ) { 206 if ( error ) {
207 printk("coda_read_super: coda_get_rootfid failed with %d\n", 207 pr_warn("coda_read_super: coda_get_rootfid failed with %d\n",
208 error); 208 error);
209 goto error; 209 goto error;
210 } 210 }
211 printk("coda_read_super: rootfid is %s\n", coda_f2s(&fid)); 211 pr_info("coda_read_super: rootfid is %s\n", coda_f2s(&fid));
212 212
213 /* make root inode */ 213 /* make root inode */
214 root = coda_cnode_make(&fid, sb); 214 root = coda_cnode_make(&fid, sb);
215 if (IS_ERR(root)) { 215 if (IS_ERR(root)) {
216 error = PTR_ERR(root); 216 error = PTR_ERR(root);
217 printk("Failure of coda_cnode_make for root: error %d\n", error); 217 pr_warn("Failure of coda_cnode_make for root: error %d\n",
218 error);
218 goto error; 219 goto error;
219 } 220 }
220 221
221 printk("coda_read_super: rootinode is %ld dev %s\n", 222 pr_info("coda_read_super: rootinode is %ld dev %s\n",
222 root->i_ino, root->i_sb->s_id); 223 root->i_ino, root->i_sb->s_id);
223 sb->s_root = d_make_root(root); 224 sb->s_root = d_make_root(root);
224 if (!sb->s_root) { 225 if (!sb->s_root) {
225 error = -EINVAL; 226 error = -EINVAL;
@@ -246,7 +247,7 @@ static void coda_put_super(struct super_block *sb)
246 sb->s_fs_info = NULL; 247 sb->s_fs_info = NULL;
247 mutex_unlock(&vcp->vc_mutex); 248 mutex_unlock(&vcp->vc_mutex);
248 249
249 printk("Coda: Bye bye.\n"); 250 pr_info("Coda: Bye bye.\n");
250} 251}
251 252
252static void coda_evict_inode(struct inode *inode) 253static void coda_evict_inode(struct inode *inode)