Merge remote-tracking branch 'usb/usb-next'

[karo-tx-linux.git] / fs / nfs / nfs4_fs.h

diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index 50cfc4ca7a02a06d383c05325ecbdd166ff25b8c..4afdee420d253862e7dded0d84f6743b00de337f 100644 (file)
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -183,10 +183,12 @@ struct nfs4_state {
 
 
 struct nfs4_exception {
-       long timeout;
-       int retry;
        struct nfs4_state *state;
        struct inode *inode;
+       long timeout;
+       unsigned char delay : 1,
+                     recovering : 1,
+                     retry : 1;
 };
 
 struct nfs4_state_recovery_ops {