fs: return EAGAIN when O_NONBLOCK write should block on frozen fs

When user asks for O_NONBLOCK behavior for a file descriptor, return
EAGAIN instead of blocking on a frozen filesystem.

This is needed so we can fix a hang with BSD accounting on frozen
filesystems.

Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Acked-by: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Nikola Ciprich <nikola.ciprich@linuxbox.cz>
Cc: Marco Stornelli <marco.stornelli@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 5b4ea5f55b8f47d0bf9a90992dd9da2d33880e14..459ea01aecacad320dbb5ddc7a0713381c8fdbd7 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1514,7 +1514,8 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb,
        size_t count, ocount;
        bool sync = (file->f_flags & O_DSYNC) || IS_SYNC(file->f_mapping->host);
 
-       sb_start_write(inode->i_sb);
+       if (!sb_start_file_write(file))
+               return -EAGAIN;
 
        mutex_lock(&inode->i_mutex);
 

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 7a0dd99e45077dfd2f7f780c140954575c9145a6..50b9868af4de7ca17233c42fa814230c6f7de639 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -2520,7 +2520,8 @@ cifs_writev(struct kiocb *iocb, const struct iovec *iov,
 
        BUG_ON(iocb->ki_pos != pos);
 
-       sb_start_write(inode->i_sb);
+       if (!sb_start_file_write(file))
+               return -EAGAIN;
 
        /*
         * We need to hold the sem to be sure nobody modifies lock list

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 34b80ba95bad8c189cfaaf7004a40ca00d8d2018..385f28ab90d912fbb5c2673d870be9a14edff2b9 100644 (file)
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -971,7 +971,8 @@ static ssize_t fuse_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
                return err;
 
        count = ocount;
-       sb_start_write(inode->i_sb);
+       if (!sb_start_file_write(file))
+               return -EAGAIN;
        mutex_lock(&inode->i_mutex);
 
        /* We can write back this queue in page reclaim */

diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index 5b2d4f0853acfad180c03d9c10764b3199e31089..67fd7f9f6a97e6080b0c419becd6071c1188409e 100644 (file)
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -2129,7 +2129,8 @@ static ssize_t ntfs_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
 
        BUG_ON(iocb->ki_pos != pos);
 
-       sb_start_write(inode->i_sb);
+       if (!sb_start_file_write(file))
+               return -EAGAIN;
        mutex_lock(&inode->i_mutex);
        ret = ntfs_file_aio_write_nolock(iocb, iov, nr_segs, &iocb->ki_pos);
        mutex_unlock(&inode->i_mutex);

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 6474cb44004d753d14e9af4648270432dc9f58f2..94b9b232c49490d9de3926bb5871045b92c32a20 100644 (file)
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2248,7 +2248,8 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
        if (iocb->ki_left == 0)
                return 0;
 
-       sb_start_write(inode->i_sb);
+       if (!sb_start_file_write(file))
+               return -EAGAIN;
 
        appending = file->f_flags & O_APPEND ? 1 : 0;
        direct_io = file->f_flags & O_DIRECT ? 1 : 0;

diff --git a/fs/splice.c b/fs/splice.c
index 23ade0e5c559cba174016ebe4b1ecbf3bd83e606..186ec03700d1458ee514becbb8fb0c69b4ef603a 100644 (file)
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1000,7 +1000,8 @@ generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
        };
        ssize_t ret;
 
-       sb_start_write(inode->i_sb);
+       if (!sb_start_file_write(out))
+               return -EAGAIN;
 
        pipe_lock(pipe);
 

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index f03bf1a456fbcacf43cc4999124a5d9072d733f0..9ff0a13131d67b468b0cc5a11fc0c9d1b3581716 100644 (file)
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -775,7 +775,8 @@ xfs_file_aio_write(
        if (ocount == 0)
                return 0;
 
-       sb_start_write(inode->i_sb);
+       if (!sb_start_file_write(file))
+               return -EAGAIN;
 
        if (XFS_FORCED_SHUTDOWN(ip->i_mount)) {
                ret = -EIO;

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 2c28271ab9d40a834c50931084cb15e8860cd765..0dc32bbb8b6ca0da390e02ba9cbf471c8cc13210 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1400,6 +1400,16 @@ static inline int sb_start_write_trylock(struct super_block *sb)
        return __sb_start_write(sb, SB_FREEZE_WRITE, false);
 }
 
+/*
+ * sb_start_write() for writing into a file. When file has O_NONBLOCK set,
+ * we use trylock semantics, otherwise we block on frozen filesystem.
+ */
+static inline int sb_start_file_write(struct file *file)
+{
+       return __sb_start_write(file->f_mapping->host->i_sb, SB_FREEZE_WRITE,
+                               !(file->f_flags & O_NONBLOCK));
+}
+
 /**
  * sb_start_pagefault - get write access to a superblock from a page fault
  * @sb: the super we write to

diff --git a/mm/filemap.c b/mm/filemap.c
index e1979fdca8055e8cae04d081606fdf2f16ba8224..8984966309efb50651b552377d2d82bc3a4932d2 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2528,7 +2528,8 @@ ssize_t generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
 
        BUG_ON(iocb->ki_pos != pos);
 
-       sb_start_write(inode->i_sb);
+       if (!sb_start_file_write(file))
+               return -EAGAIN;
        mutex_lock(&inode->i_mutex);
        ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos);
        mutex_unlock(&inode->i_mutex);