fs: move inode_dio_wait calls into ->setattr

Let filesystems handle waiting for direct I/O requests themselves instead
of doing it beforehand.  This means filesystem-specific locks to prevent
new dio referenes from appearing can be held.  This is important to allow
generalizing i_dio_count to non-DIO_LOCKING filesystems.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/attr.c b/fs/attr.c
index f177ac86fa48b6bb974c0e6f125681880a7bd391..538e27959d3f7fec79a8a0647723830b2bb4a5b4 100644 (file)
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -232,9 +232,6 @@ int notify_change(struct dentry * dentry, struct iattr * attr)
        if (error)
                return error;
 
-       if (ia_valid & ATTR_SIZE)
-               inode_dio_wait(inode);
-
        if (inode->i_op->setattr)
                error = inode->i_op->setattr(dentry, attr);
        else

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 788e09a07f7ec840a7f521da7e790fc2b131ab90..06e7c767ab35e5c70cd91757f9453654ec5496d8 100644 (file)
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -1184,6 +1184,8 @@ static int ext2_setsize(struct inode *inode, loff_t newsize)
        if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
                return -EPERM;
 
+       inode_dio_wait(inode);
+
        if (mapping_is_xip(inode->i_mapping))
                error = xip_truncate_page(inode->i_mapping, newsize);
        else if (test_opt(inode->i_sb, NOBH))

diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 3451d23c3bae3eedd75d8504694a22735e7dc291..99c28b246b89b70ad72bcb68ffb07d59b9195fd6 100644 (file)
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -3216,6 +3216,9 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr)
                ext3_journal_stop(handle);
        }
 
+       if (attr->ia_valid & ATTR_SIZE)
+               inode_dio_wait(inode);
+
        if (S_ISREG(inode->i_mode) &&
            attr->ia_valid & ATTR_SIZE && attr->ia_size < inode->i_size) {
                handle_t *handle;

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index bd309764557f0e0abecbec8388cbcd90b1611b5e..9ec0a2ba2502edbb76c517a147081eb0e5d643d6 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -5351,6 +5351,8 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr)
        }
 
        if (attr->ia_valid & ATTR_SIZE) {
+               inode_dio_wait(inode);
+
                if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) {
                        struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
 

diff --git a/fs/fat/file.c b/fs/fat/file.c
index a4a3a3c06436d79293cc349187f616a3e6e79bd2..e1587c54d3c1398373a027c01fc81dd4083e2146 100644 (file)
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
@@ -397,6 +397,8 @@ int fat_setattr(struct dentry *dentry, struct iattr *attr)
         * sequence.
         */
        if (attr->ia_valid & ATTR_SIZE) {
+               inode_dio_wait(inode);
+
                if (attr->ia_size > inode->i_size) {
                        error = fat_cont_expand(inode, attr->ia_size);
                        if (error || attr->ia_valid == ATTR_SIZE)

diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index e65493a8ac002ad91a68433bf76dbe2243ff08e1..2cd0e56b8893381fc7b3b533738a08d6ec8e48a7 100644 (file)
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -1224,6 +1224,8 @@ int gfs2_setattr_size(struct inode *inode, u64 newsize)
        if (ret)
                return ret;
 
+       inode_dio_wait(inode);
+
        oldsize = inode->i_size;
        if (newsize >= oldsize)
                return do_grow(inode, newsize);

diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index fff16c968e67705a4d82e0bfcda6fca54aa005b0..48d567cc203e54c4ff81d5ce32236a2304293ea1 100644 (file)
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -615,6 +615,8 @@ int hfs_inode_setattr(struct dentry *dentry, struct iattr * attr)
 
        if ((attr->ia_valid & ATTR_SIZE) &&
            attr->ia_size != i_size_read(inode)) {
+               inode_dio_wait(inode);
+
                error = vmtruncate(inode, attr->ia_size);
                if (error)
                        return error;

diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index b248a6cfcad93bb76631f7756b07b4ee6aff3d7e..b0a0a4b621eb465a1ea5a03bc48c97fae70c51d7 100644 (file)
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -296,6 +296,8 @@ static int hfsplus_setattr(struct dentry *dentry, struct iattr *attr)
 
        if ((attr->ia_valid & ATTR_SIZE) &&
            attr->ia_size != i_size_read(inode)) {
+               inode_dio_wait(inode);
+
                error = vmtruncate(inode, attr->ia_size);
                if (error)
                        return error;

diff --git a/fs/jfs/file.c b/fs/jfs/file.c
index 2f3f531f36064772dfd4e934847dd5c33fd1cbe4..9f32315acef1584877e40d9bbbf59645dcbba6ac 100644 (file)
--- a/fs/jfs/file.c
+++ b/fs/jfs/file.c
@@ -110,6 +110,8 @@ int jfs_setattr(struct dentry *dentry, struct iattr *iattr)
 
        if ((iattr->ia_valid & ATTR_SIZE) &&
            iattr->ia_size != i_size_read(inode)) {
+               inode_dio_wait(inode);
+
                rc = vmtruncate(inode, iattr->ia_size);
                if (rc)
                        return rc;

diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index be8664c6a82585f2e2b2665849d4b5575b1202db..13f113154a9fcfea1063a6e413abebb57b6f5493 100644 (file)
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -778,6 +778,8 @@ int nilfs_setattr(struct dentry *dentry, struct iattr *iattr)
 
        if ((iattr->ia_valid & ATTR_SIZE) &&
            iattr->ia_size != i_size_read(inode)) {
+               inode_dio_wait(inode);
+
                err = vmtruncate(inode, iattr->ia_size);
                if (unlikely(err))
                        goto out_err;

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 2c3a465514a220a3bd833b00b7d5ca93036b6d3b..736283ca4a4caff2e60b6f97ed86e2bc83dd34ba 100644 (file)
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -1142,6 +1142,8 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
                if (status)
                        goto bail_unlock;
 
+               inode_dio_wait(inode);
+
                if (i_size_read(inode) > attr->ia_size) {
                        if (ocfs2_should_order_data(inode)) {
                                status = ocfs2_begin_ordered_truncate(inode,

diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 4fd5bb33dbb5e40f4969e38d7c4b52756d8bfab7..dcf543d8caf14cf19df050889bdd17035ea446f0 100644 (file)
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -3114,6 +3114,9 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr)
                        error = -EFBIG;
                        goto out;
                }
+
+               inode_dio_wait(inode);
+
                /* fill in hole pointers in the expanding truncate case. */
                if (attr->ia_size > inode->i_size) {
                        error = generic_cont_expand_simple(inode, attr->ia_size);