Btrfs: skip writeback of last page when truncating file to same size

[sfrench/cifs-2.6.git] / fs / fcntl.c

diff --git a/fs/fcntl.c b/fs/fcntl.c
index e95fa0a352eaaf0c5f1196b9e444ceafd97baba6..1e97f1fda90c9fe9db90e7cdc70405eadcd721d4 100644 (file)
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -26,7 +26,7 @@
 #include <linux/shmem_fs.h>
 #include <linux/compat.h>
 
-#include <asm/poll.h>
+#include <linux/poll.h>
 #include <asm/siginfo.h>
 #include <linux/uaccess.h>
 
@@ -691,12 +691,12 @@ COMPAT_SYSCALL_DEFINE3(fcntl, unsigned int, fd, unsigned int, cmd,
 /* Table to convert sigio signal codes into poll band bitmaps */
 
 static const __poll_t band_table[NSIGPOLL] = {
-       POLLIN | POLLRDNORM,                    /* POLL_IN */
-       POLLOUT | POLLWRNORM | POLLWRBAND,      /* POLL_OUT */
-       POLLIN | POLLRDNORM | POLLMSG,          /* POLL_MSG */
-       POLLERR,                                /* POLL_ERR */
-       POLLPRI | POLLRDBAND,                   /* POLL_PRI */
-       POLLHUP | POLLERR                       /* POLL_HUP */
+       EPOLLIN | EPOLLRDNORM,                  /* POLL_IN */
+       EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND,   /* POLL_OUT */
+       EPOLLIN | EPOLLRDNORM | EPOLLMSG,               /* POLL_MSG */
+       EPOLLERR,                               /* POLL_ERR */
+       EPOLLPRI | EPOLLRDBAND,                 /* POLL_PRI */
+       EPOLLHUP | EPOLLERR                     /* POLL_HUP */
 };
 
 static inline int sigio_perm(struct task_struct *p,