Merge branch 'unstable' into mds

Conflicts:
	src/TODO

diff --cc src/TODO
index a57a00112b5cf5a90f1b47c6fade57953e94c92b,93f397562edcd47bd908ea09ff1a2c327662e977..bdc3b297cd12ea6c7d7393742047f140cd1ede20
--- 1/src/TODO
--- 2/src/TODO
+++ b/src/TODO
@@@ -60,8 -60,9 +60,10 @@@ filestor
    - need an osdmap cache layer?
  
  bugs
- 
 +- mds: rdlock forwards to auth on inode file lock, leading to an infinite forward loop if dirfrag is a subtree on another node.
+ - mds states
+   - closing -> opening transition
+ - mds prepare_force_open_sessions, then import aborts.. session is still OPENING but no client_session is sent...
  - rm -r failure (on kernel tree)
  - dbench 1, restart mds (may take a few times), dbench will error out.
  

diff --cc src/mds/Locker.cc
Simple merge