Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[linux.git] / fs / autofs / autofs_i.h

diff --git a/fs/autofs/autofs_i.h b/fs/autofs/autofs_i.h
index 3e59f0ed777bff66542a32cda86e2f90b1a821ef..70c132acdab1bcfe764f7aa28efe7be2c035e63b 100644 (file)
--- a/fs/autofs/autofs_i.h
+++ b/fs/autofs/autofs_i.h
@@ -105,6 +105,7 @@ struct autofs_wait_queue {
 
 #define AUTOFS_SBI_CATATONIC   0x0001
 #define AUTOFS_SBI_STRICTEXPIRE 0x0002
+#define AUTOFS_SBI_IGNORE      0x0004
 
 struct autofs_sb_info {
        u32 magic;
@@ -215,6 +216,8 @@ static inline int autofs_prepare_pipe(struct file *pipe)
                return -EINVAL;
        /* We want a packet pipe */
        pipe->f_flags |= O_DIRECT;
+       /* We don't expect -EAGAIN */
+       pipe->f_flags &= ~O_NONBLOCK;
        return 0;
 }