fuse: rename FUSE_WRITE_KILL_PRIV to FUSE_WRITE_KILL_SUIDGID

[linux-2.6-microblaze.git] / fs / fuse / file.c

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index c03034e..603af84 100644 (file)
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1451,7 +1451,7 @@ ssize_t fuse_direct_io(struct fuse_io_priv *io, struct iov_iter *iter,
 
                if (write) {
                        if (!capable(CAP_FSETID))
-                               ia->write.in.write_flags |= FUSE_WRITE_KILL_PRIV;
+                               ia->write.in.write_flags |= FUSE_WRITE_KILL_SUIDGID;
 
                        nres = fuse_send_write(ia, pos, nbytes, owner);
                } else {
@@ -2281,6 +2281,9 @@ static int fuse_launder_page(struct page *page)
        int err = 0;
        if (clear_page_dirty_for_io(page)) {
                struct inode *inode = page->mapping->host;
+
+               /* Serialize with pending writeback for the same page */
+               fuse_wait_on_page_writeback(inode, page->index);
                err = fuse_writepage_locked(page);
                if (!err)
                        fuse_wait_on_page_writeback(inode, page->index);