Skip to content

Commit bcc6627

Browse files
zargonyzargony
committed
Fix logging after rust-lang/rust#10006 
1 parent f7b96aa commit bcc6627

File tree

2 files changed

+48
-48
lines changed

2 files changed

+48
-48
lines changed

‎src/request.rs

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ impl Request {
6565
let opcode: fuse_opcode = match FromPrimitive::from_u32(header.opcode) {
6666
Some(op) => op,
6767
None => {
68-
warn2!("Ignoring unknown FUSE operation {:u}", header.opcode)
68+
warn!("Ignoring unknown FUSE operation {:u}", header.opcode)
6969
self.reply_error(ch, ENOSYS);
7070
return;
7171
},
@@ -74,10 +74,10 @@ impl Request {
7474
// Filesystem initialization
7575
FUSE_INIT => {
7676
let arg: &fuse_init_in = data.fetch();
77-
debug2!("INIT({:u}) kernel: ABI {:u}.{:u}, flags {:#x}, max readahead {:u}", header.unique, arg.major, arg.minor, arg.flags, arg.max_readahead);
77+
debug!("INIT({:u}) kernel: ABI {:u}.{:u}, flags {:#x}, max readahead {:u}", header.unique, arg.major, arg.minor, arg.flags, arg.max_readahead);
7878
// We don't support ABI versions before 7.6
7979
if arg.major < 7 || (arg.major < 7 && arg.minor < 6) {
80-
error2!("Unsupported FUSE ABI version {:u}.{:u}", arg.major, arg.minor);
80+
error!("Unsupported FUSE ABI version {:u}.{:u}", arg.major, arg.minor);
8181
self.reply_error(ch, EPROTO);
8282
return;
8383
}
@@ -101,166 +101,166 @@ impl Request {
101101
unused: 0,
102102
max_write: MAX_WRITE_SIZE,
103103
};
104-
debug2!("INIT({:u}) response: ABI {:u}.{:u}, flags {:#x}, max readahead {:u}, max write {:u}", header.unique, reply.major, reply.minor, reply.flags, reply.max_readahead, reply.max_write);
104+
debug!("INIT({:u}) response: ABI {:u}.{:u}, flags {:#x}, max readahead {:u}, max write {:u}", header.unique, reply.major, reply.minor, reply.flags, reply.max_readahead, reply.max_write);
105105
se.initialized = true;
106106
self.reply(ch, Ok(reply));
107107
},
108108
// Any operation is invalid before initialization
109109
_ if !se.initialized => {
110-
warn2!("Ignoring FUSE operation {:u} before init", header.opcode);
110+
warn!("Ignoring FUSE operation {:u} before init", header.opcode);
111111
self.reply_error(ch, EIO);
112112
},
113113
// Filesystem destroyed
114114
FUSE_DESTROY => {
115-
debug2!("DESTROY({:u})", header.unique);
115+
debug!("DESTROY({:u})", header.unique);
116116
se.filesystem.destroy();
117117
se.destroyed = true;
118118
self.reply(ch, Ok(()));
119119
}
120120
// Any operation is invalid after destroy
121121
_ if se.destroyed => {
122-
warn2!("Ignoring FUSE operation {:u} after destroy", header.opcode);
122+
warn!("Ignoring FUSE operation {:u} after destroy", header.opcode);
123123
self.reply_error(ch, EIO);
124124
}
125125

126126
FUSE_INTERRUPT => {
127127
let arg: &fuse_interrupt_in = data.fetch();
128-
debug2!("INTERRUPT({:u}) unique {:u}", header.unique, arg.unique);
128+
debug!("INTERRUPT({:u}) unique {:u}", header.unique, arg.unique);
129129
// TODO: handle FUSE_INTERRUPT
130130
self.reply_error(ch, ENOSYS);
131131
},
132132

133133
FUSE_LOOKUP => {
134134
let name = data.fetch_str();
135-
debug2!("LOOKUP({:u}) parent {:#018x}, name {:s}", header.unique, header.nodeid, logstr(name));
135+
debug!("LOOKUP({:u}) parent {:#018x}, name {:s}", header.unique, header.nodeid, logstr(name));
136136
self.reply(ch, se.filesystem.lookup(header.nodeid, name));
137137
},
138138
FUSE_FORGET => {
139139
let arg: &fuse_forget_in = data.fetch();
140-
debug2!("FORGET({:u}) ino {:#018x}, nlookup {:u}", header.unique, header.nodeid, arg.nlookup);
140+
debug!("FORGET({:u}) ino {:#018x}, nlookup {:u}", header.unique, header.nodeid, arg.nlookup);
141141
se.filesystem.forget(header.nodeid, arg.nlookup as uint); // no reply
142142
},
143143
FUSE_GETATTR => {
144-
debug2!("GETATTR({:u}) ino {:#018x}", header.unique, header.nodeid);
144+
debug!("GETATTR({:u}) ino {:#018x}", header.unique, header.nodeid);
145145
self.reply(ch, se.filesystem.getattr(header.nodeid));
146146
},
147147
FUSE_SETATTR => {
148148
let arg: &fuse_setattr_in = data.fetch();
149-
debug2!("SETATTR({:u}) ino {:#018x}, valid {:#x}", header.unique, header.nodeid, arg.valid);
149+
debug!("SETATTR({:u}) ino {:#018x}, valid {:#x}", header.unique, header.nodeid, arg.valid);
150150
self.reply(ch, se.filesystem.setattr(header.nodeid, arg));
151151
},
152152
FUSE_READLINK => {
153-
debug2!("READLINK({:u}) ino {:#018x}", header.unique, header.nodeid);
153+
debug!("READLINK({:u}) ino {:#018x}", header.unique, header.nodeid);
154154
self.reply(ch, se.filesystem.readlink(header.nodeid));
155155
},
156156
FUSE_MKNOD => {
157157
let arg: &fuse_mknod_in = data.fetch();
158158
let name = data.fetch_str();
159-
debug2!("MKNOD({:u}) parent {:#018x}, name {:s}, mode {:#05o}, rdev {:u}", header.unique, header.nodeid, logstr(name), arg.mode, arg.rdev);
159+
debug!("MKNOD({:u}) parent {:#018x}, name {:s}, mode {:#05o}, rdev {:u}", header.unique, header.nodeid, logstr(name), arg.mode, arg.rdev);
160160
self.reply(ch, se.filesystem.mknod(header.nodeid, name, arg.mode as mode_t, arg.rdev as dev_t));
161161
},
162162
FUSE_MKDIR => {
163163
let arg: &fuse_mkdir_in = data.fetch();
164164
let name = data.fetch_str();
165-
debug2!("MKDIR({:u}) parent {:#018x}, name {:s}, mode {:#05o}", header.unique, header.nodeid, logstr(name), arg.mode);
165+
debug!("MKDIR({:u}) parent {:#018x}, name {:s}, mode {:#05o}", header.unique, header.nodeid, logstr(name), arg.mode);
166166
self.reply(ch, se.filesystem.mkdir(header.nodeid, name, arg.mode as mode_t));
167167
},
168168
FUSE_UNLINK => {
169169
let name = data.fetch_str();
170-
debug2!("UNLINK({:u}) parent {:#018x}, name {:s}", header.unique, header.nodeid, logstr(name));
170+
debug!("UNLINK({:u}) parent {:#018x}, name {:s}", header.unique, header.nodeid, logstr(name));
171171
self.reply(ch, se.filesystem.unlink(header.nodeid, name));
172172
},
173173
FUSE_RMDIR => {
174174
let name = data.fetch_str();
175-
debug2!("RMDIR({:u}) parent {:#018x}, name {:s}", header.unique, header.nodeid, logstr(name));
175+
debug!("RMDIR({:u}) parent {:#018x}, name {:s}", header.unique, header.nodeid, logstr(name));
176176
self.reply(ch, se.filesystem.rmdir(header.nodeid, name));
177177
},
178178
FUSE_SYMLINK => {
179179
let name = data.fetch_str();
180180
let link = data.fetch_str();
181-
debug2!("SYMLINK({:u}) parent {:#018x}, name {:s}, link {:s}", header.unique, header.nodeid, logstr(name), logstr(link));
181+
debug!("SYMLINK({:u}) parent {:#018x}, name {:s}, link {:s}", header.unique, header.nodeid, logstr(name), logstr(link));
182182
self.reply(ch, se.filesystem.symlink(header.nodeid, name, link));
183183
},
184184
FUSE_RENAME => {
185185
let arg: &fuse_rename_in = data.fetch();
186186
let name = data.fetch_str();
187187
let newname = data.fetch_str();
188-
debug2!("RENAME({:u}) parent {:#018x}, name {:s}, newparent {:#018x}, newname {:s}", header.unique, header.nodeid, logstr(name), arg.newdir, logstr(newname));
188+
debug!("RENAME({:u}) parent {:#018x}, name {:s}, newparent {:#018x}, newname {:s}", header.unique, header.nodeid, logstr(name), arg.newdir, logstr(newname));
189189
self.reply(ch, se.filesystem.rename(header.nodeid, name, arg.newdir, newname));
190190
},
191191
FUSE_LINK => {
192192
let arg: &fuse_link_in = data.fetch();
193193
let newname = data.fetch_str();
194-
debug2!("LINK({:u}) ino {:#018x}, newparent {:#018x}, newname {:s}", header.unique, arg.oldnodeid, header.nodeid, logstr(newname));
194+
debug!("LINK({:u}) ino {:#018x}, newparent {:#018x}, newname {:s}", header.unique, arg.oldnodeid, header.nodeid, logstr(newname));
195195
self.reply(ch, se.filesystem.link(arg.oldnodeid, header.nodeid, newname));
196196
},
197197
FUSE_OPEN => {
198198
let arg: &fuse_open_in = data.fetch();
199-
debug2!("OPEN({:u}) ino {:#018x}, flags {:#x}", header.unique, header.nodeid, arg.flags);
199+
debug!("OPEN({:u}) ino {:#018x}, flags {:#x}", header.unique, header.nodeid, arg.flags);
200200
self.reply(ch, se.filesystem.open(header.nodeid, arg.flags as uint));
201201
},
202202
FUSE_READ => {
203203
let arg: &fuse_read_in = data.fetch();
204-
debug2!("READ({:u}) ino {:#018x}, fh {:u}, offset {:u}, size {:u}", header.unique, header.nodeid, arg.fh, arg.offset, arg.size);
204+
debug!("READ({:u}) ino {:#018x}, fh {:u}, offset {:u}, size {:u}", header.unique, header.nodeid, arg.fh, arg.offset, arg.size);
205205
self.reply(ch, se.filesystem.read(header.nodeid, arg.fh, arg.offset as off_t, arg.size as size_t));
206206
},
207207
FUSE_WRITE => {
208208
let arg: &fuse_write_in = data.fetch();
209209
let data = data.fetch_data();
210210
assert!(data.len() == arg.size as uint);
211-
debug2!("WRITE({:u}) ino {:#018x}, fh {:u}, offset {:u}, size {:u}, flags {:#x}", header.unique, header.nodeid, arg.fh, arg.offset, arg.size, arg.write_flags);
211+
debug!("WRITE({:u}) ino {:#018x}, fh {:u}, offset {:u}, size {:u}, flags {:#x}", header.unique, header.nodeid, arg.fh, arg.offset, arg.size, arg.write_flags);
212212
self.reply(ch, se.filesystem.write(header.nodeid, arg.fh, arg.offset as off_t, data, arg.write_flags as uint).and_then(|written| {
213213
Ok(~fuse_write_out { size: written as u32, padding: 0 })
214214
}));
215215
},
216216
FUSE_FLUSH => {
217217
let arg: &fuse_flush_in = data.fetch();
218-
debug2!("FLUSH({:u}) ino {:#018x}, fh {:u}, lock owner {:u}", header.unique, header.nodeid, arg.fh, arg.lock_owner);
218+
debug!("FLUSH({:u}) ino {:#018x}, fh {:u}, lock owner {:u}", header.unique, header.nodeid, arg.fh, arg.lock_owner);
219219
self.reply(ch, se.filesystem.flush(header.nodeid, arg.fh, arg.lock_owner));
220220
},
221221
FUSE_RELEASE => {
222222
let arg: &fuse_release_in = data.fetch();
223223
let flush = match arg.release_flags & FUSE_RELEASE_FLUSH { 0 => false, _ => true };
224-
debug2!("RELEASE({:u}) ino {:#018x}, fh {:u}, flags {:#x}, release flags {:#x}, lock owner {:u}", header.unique, header.nodeid, arg.fh, arg.flags, arg.release_flags, arg.lock_owner);
224+
debug!("RELEASE({:u}) ino {:#018x}, fh {:u}, flags {:#x}, release flags {:#x}, lock owner {:u}", header.unique, header.nodeid, arg.fh, arg.flags, arg.release_flags, arg.lock_owner);
225225
self.reply(ch, se.filesystem.release(header.nodeid, arg.fh, arg.flags as uint, arg.lock_owner, flush));
226226
},
227227
FUSE_FSYNC => {
228228
let arg: &fuse_fsync_in = data.fetch();
229229
let datasync = match arg.fsync_flags & 1 { 0 => false, _ => true };
230-
debug2!("FSYNC({:u}) ino {:#018x}, fh {:u}, flags {:#x}", header.unique, header.nodeid, arg.fh, arg.fsync_flags);
230+
debug!("FSYNC({:u}) ino {:#018x}, fh {:u}, flags {:#x}", header.unique, header.nodeid, arg.fh, arg.fsync_flags);
231231
self.reply(ch, se.filesystem.fsync(header.nodeid, arg.fh, datasync));
232232
},
233233
FUSE_OPENDIR => {
234234
let arg: &fuse_open_in = data.fetch();
235-
debug2!("OPENDIR({:u}) ino {:#018x}, flags {:#x}", header.unique, header.nodeid, arg.flags);
235+
debug!("OPENDIR({:u}) ino {:#018x}, flags {:#x}", header.unique, header.nodeid, arg.flags);
236236
self.reply(ch, se.filesystem.opendir(header.nodeid, arg.flags as uint));
237237
},
238238
FUSE_READDIR => {
239239
let arg: &fuse_read_in = data.fetch();
240-
debug2!("READDIR({:u}) ino {:#018x}, fh {:u}, offset {:u}, size {:u}", header.unique, header.nodeid, arg.fh, arg.offset, arg.size);
240+
debug!("READDIR({:u}) ino {:#018x}, fh {:u}, offset {:u}, size {:u}", header.unique, header.nodeid, arg.fh, arg.offset, arg.size);
241241
self.reply(ch, se.filesystem.readdir(header.nodeid, arg.fh, arg.offset as off_t, DirBuffer::new(arg.size as uint)));
242242
},
243243
FUSE_RELEASEDIR => {
244244
let arg: &fuse_release_in = data.fetch();
245-
debug2!("RELEASEDIR({:u}) ino {:#018x}, fh {:u}, flags {:#x}, release flags {:#x}, lock owner {:u}", header.unique, header.nodeid, arg.fh, arg.flags, arg.release_flags, arg.lock_owner);
245+
debug!("RELEASEDIR({:u}) ino {:#018x}, fh {:u}, flags {:#x}, release flags {:#x}, lock owner {:u}", header.unique, header.nodeid, arg.fh, arg.flags, arg.release_flags, arg.lock_owner);
246246
self.reply(ch, se.filesystem.releasedir(header.nodeid, arg.fh, arg.flags as uint));
247247
},
248248
FUSE_FSYNCDIR => {
249249
let arg: &fuse_fsync_in = data.fetch();
250250
let datasync = match arg.fsync_flags & 1 { 0 => false, _ => true };
251-
debug2!("FSYNCDIR({:u}) ino {:#018x}, fh {:u}, flags {:#x}", header.unique, header.nodeid, arg.fh, arg.fsync_flags);
251+
debug!("FSYNCDIR({:u}) ino {:#018x}, fh {:u}, flags {:#x}", header.unique, header.nodeid, arg.fh, arg.fsync_flags);
252252
self.reply(ch, se.filesystem.fsyncdir(header.nodeid, arg.fh, datasync));
253253
},
254254
FUSE_STATFS => {
255-
debug2!("STATFS({:u}) ino {:#018x}", header.unique, header.nodeid);
255+
debug!("STATFS({:u}) ino {:#018x}", header.unique, header.nodeid);
256256
self.reply(ch, se.filesystem.statfs(header.nodeid));
257257
},
258258
FUSE_SETXATTR => {
259259
let arg: &fuse_setxattr_in = data.fetch();
260260
let name = data.fetch_str();
261261
let value = data.fetch_data();
262262
assert!(value.len() == arg.size as uint);
263-
debug2!("SETXATTR({:u}) ino {:#018x}, name {:s}, size {:u}, flags {:#x}", header.unique, header.nodeid, logstr(name), arg.size, arg.flags);
263+
debug!("SETXATTR({:u}) ino {:#018x}, name {:s}, size {:u}, flags {:#x}", header.unique, header.nodeid, logstr(name), arg.size, arg.flags);
264264
#[cfg(target_os = "macos")]
265265
fn get_position(arg: &fuse_setxattr_in) -> off_t { arg.position as off_t }
266266
#[cfg(not(target_os = "macos"))]
@@ -270,7 +270,7 @@ impl Request {
270270
FUSE_GETXATTR => {
271271
let arg: &fuse_getxattr_in = data.fetch();
272272
let name = data.fetch_str();
273-
debug2!("GETXATTR({:u}) ino {:#018x}, name {:s}, size {:u}", header.unique, header.nodeid, logstr(name), arg.size);
273+
debug!("GETXATTR({:u}) ino {:#018x}, name {:s}, size {:u}", header.unique, header.nodeid, logstr(name), arg.size);
274274
match se.filesystem.getxattr(header.nodeid, name) {
275275
// If arg.size is zero, the size of the value should be sent with fuse_getxattr_out
276276
Ok(ref value) if arg.size == 0 => self.reply(ch, Ok(fuse_getxattr_out { size: value.len() as u32, padding: 0 })),
@@ -282,7 +282,7 @@ impl Request {
282282
},
283283
FUSE_LISTXATTR => {
284284
let arg: &fuse_getxattr_in = data.fetch();
285-
debug2!("LISTXATTR({:u}) ino {:#018x}, size {:u}", header.unique, header.nodeid, arg.size);
285+
debug!("LISTXATTR({:u}) ino {:#018x}, size {:u}", header.unique, header.nodeid, arg.size);
286286
match se.filesystem.listxattr(header.nodeid) {
287287
// TODO: If arg.size is zero, the size of the attribute list should be sent with fuse_getxattr_out
288288
// TODO: If arg.size is non-zero, send the attribute list if it fits, or ERANGE otherwise
@@ -292,34 +292,34 @@ impl Request {
292292
},
293293
FUSE_REMOVEXATTR => {
294294
let name = data.fetch_str();
295-
debug2!("REMOVEXATTR({:u}) ino {:#018x}, name {:s}", header.unique, header.nodeid, logstr(name));
295+
debug!("REMOVEXATTR({:u}) ino {:#018x}, name {:s}", header.unique, header.nodeid, logstr(name));
296296
self.reply(ch, se.filesystem.removexattr(header.nodeid, name));
297297
},
298298
FUSE_ACCESS => {
299299
let arg: &fuse_access_in = data.fetch();
300-
debug2!("ACCESS({:u}) ino {:#018x}, mask {:#05o}", header.unique, header.nodeid, arg.mask);
300+
debug!("ACCESS({:u}) ino {:#018x}, mask {:#05o}", header.unique, header.nodeid, arg.mask);
301301
self.reply(ch, se.filesystem.access(header.nodeid, arg.mask as uint));
302302
},
303303
FUSE_CREATE => {
304304
let arg: &fuse_open_in = data.fetch();
305305
let name = data.fetch_str();
306-
debug2!("CREATE({:u}) parent {:#018x}, name {:s}, mode {:#05o}, flags {:#x}", header.unique, header.nodeid, logstr(name), arg.mode, arg.flags);
306+
debug!("CREATE({:u}) parent {:#018x}, name {:s}, mode {:#05o}, flags {:#x}", header.unique, header.nodeid, logstr(name), arg.mode, arg.flags);
307307
self.reply(ch, se.filesystem.create(header.nodeid, name, arg.mode as mode_t, arg.flags as uint));
308308
},
309309
FUSE_GETLK => {
310310
let arg: &fuse_lk_in = data.fetch();
311-
debug2!("GETLK({:u}) ino {:#018x}, fh {:u}, lock owner {:u}", header.unique, header.nodeid, arg.fh, arg.owner);
311+
debug!("GETLK({:u}) ino {:#018x}, fh {:u}, lock owner {:u}", header.unique, header.nodeid, arg.fh, arg.owner);
312312
self.reply(ch, se.filesystem.getlk(header.nodeid, arg.fh, arg.owner, &arg.lk));
313313
},
314314
FUSE_SETLK | FUSE_SETLKW => {
315315
let arg: &fuse_lk_in = data.fetch();
316316
let sleep = match opcode { FUSE_SETLKW => true, _ => false };
317-
debug2!("SETLK({:u}) ino {:#018x}, fh {:u}, lock owner {:u}", header.unique, header.nodeid, arg.fh, arg.owner);
317+
debug!("SETLK({:u}) ino {:#018x}, fh {:u}, lock owner {:u}", header.unique, header.nodeid, arg.fh, arg.owner);
318318
self.reply(ch, se.filesystem.setlk(header.nodeid, arg.fh, arg.owner, &arg.lk, sleep));
319319
},
320320
FUSE_BMAP => {
321321
let arg: &fuse_bmap_in = data.fetch();
322-
debug2!("BMAP({:u}) ino {:#018x}, blocksize {:u}, ids {:u}", header.unique, header.nodeid, arg.blocksize, arg.block);
322+
debug!("BMAP({:u}) ino {:#018x}, blocksize {:u}, ids {:u}", header.unique, header.nodeid, arg.blocksize, arg.block);
323323
self.reply(ch, se.filesystem.bmap(header.nodeid, arg.blocksize as size_t, arg.block));
324324
},
325325
// OS X only
@@ -333,18 +333,18 @@ impl Request {
333333
match opcode {
334334
FUSE_SETVOLNAME => {
335335
let name = data.fetch_str();
336-
debug2!("SETVOLNAME({:u}) name {:s}", header.unique, logstr(name));
336+
debug!("SETVOLNAME({:u}) name {:s}", header.unique, logstr(name));
337337
self.reply(ch, se.filesystem.setvolname(name));
338338
},
339339
FUSE_EXCHANGE => {
340340
let arg: &fuse_exchange_in = data.fetch();
341341
let oldname = data.fetch_str();
342342
let newname = data.fetch_str();
343-
debug2!("EXCHANGE({:u}) parent {:#018x}, name {:s}, newparent {:#018x}, newname {:s}, options {:#x}", header.unique, arg.olddir, logstr(oldname), arg.newdir, logstr(newname), arg.options);
343+
debug!("EXCHANGE({:u}) parent {:#018x}, name {:s}, newparent {:#018x}, newname {:s}, options {:#x}", header.unique, arg.olddir, logstr(oldname), arg.newdir, logstr(newname), arg.options);
344344
self.reply(ch, se.filesystem.exchange(arg.olddir, oldname, arg.newdir, newname, arg.options as uint));
345345
},
346346
FUSE_GETXTIMES => {
347-
debug2!("GETXTIMES({:u}) ino {:#018x}", header.unique, header.nodeid);
347+
debug!("GETXTIMES({:u}) ino {:#018x}", header.unique, header.nodeid);
348348
self.reply(ch, se.filesystem.getxtimes(header.nodeid));
349349
},
350350
_ => unreachable!(),
@@ -354,7 +354,7 @@ impl Request {
354354
/// Warn about unsupported OS X operation on other os
355355
#[cfg(not(target_os = "macos"))]
356356
fn dispatch_macos_only<FS: Filesystem> (&self, opcode: fuse_opcode, _se: &mut Session<FS>, _header: &fuse_in_header, _ch: Channel, _data: &mut ArgumentIterator) {
357-
warn2!("Ignoring unsupported FUSE operation {:u}", opcode)
357+
warn!("Ignoring unsupported FUSE operation {:u}", opcode)
358358
self.reply_error(ch, ENOSYS);
359359
}
360360

‎src/session.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub struct Session<FS> {
2424
impl<FS: Filesystem+Send> Session<FS> {
2525
/// Mount the given filesystem to the given mountpoint
2626
pub fn mount (filesystem: FS, mountpoint: &Path, options: &[&[u8]]) -> Session<FS> {
27-
info2!("Mounting {}", mountpoint.display());
27+
info!("Mounting {}", mountpoint.display());
2828
let ch = Channel::mount(mountpoint, options).expect("unable to mount filesystem");
2929
Session {
3030
filesystem: filesystem,
@@ -48,7 +48,7 @@ impl<FS: Filesystem+Send> Session<FS> {
4848
Err(EINTR) => continue, // Interrupted system call, retry
4949
Err(EAGAIN) => continue, // Explicitly try again
5050
Err(ENODEV) => break, // Filesystem was unmounted, quit the loop
51-
Err(err) => fail2!("Lost connection to FUSE device. Error {:i}", err),
51+
Err(err) => fail!("Lost connection to FUSE device. Error {:i}", err),
5252
Ok(_) => req.dispatch(self),
5353
}
5454
}
@@ -63,7 +63,7 @@ impl<FS: Filesystem+Send> Session<FS> {
6363
#[unsafe_destructor]
6464
impl<FS: Filesystem+Send> Drop for Session<FS> {
6565
fn drop (&mut self) {
66-
info2!("Unmounting {}", self.mountpoint.display());
66+
info!("Unmounting {}", self.mountpoint.display());
6767
self.ch.close(); // Close channel before unnmount to prevent sync unmount deadlock
6868
Channel::unmount(&self.mountpoint);
6969
}
@@ -91,7 +91,7 @@ impl BackgroundSession {
9191
/// End the session by unmounting the filesystem (which will
9292
/// eventually end the session loop)
9393
pub fn unmount (&self) {
94-
info2!("Unmounting {}", self.mountpoint.display());
94+
info!("Unmounting {}", self.mountpoint.display());
9595
Channel::unmount(&self.mountpoint);
9696
}
9797
}

0 commit comments

Comments
 (0)