diff options
| author | Bob Peterson <rpeterso@redhat.com> | 2013-05-28 10:04:44 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2013-06-03 16:38:58 +0100 |
| commit | 2b3dcf35810ff02ad0e785527a25c1b13bf82b19 (patch) | |
| tree | 0ab2a2f709290e2eb4d74d385a7d832929e3768c /fs/gfs2/bmap.c | |
| parent | 4a586812055dbd2588b0836ab758f6b9670c3949 (diff) | |
| download | linux-2b3dcf35810ff02ad0e785527a25c1b13bf82b19.tar.gz linux-2b3dcf35810ff02ad0e785527a25c1b13bf82b19.tar.bz2 linux-2b3dcf35810ff02ad0e785527a25c1b13bf82b19.zip | |
GFS2: Increase i_writecount during gfs2_setattr_size
This patch calls get_write_access in a few functions. This
merely increases inode->i_writecount for the duration of the function.
That will ensure that any file closes won't delete the inode's
multi-block reservation while the function is running.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/bmap.c')
| -rw-r--r-- | fs/gfs2/bmap.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index 1dc9a13ce6bb..93b5809c20bb 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -1286,17 +1286,26 @@ int gfs2_setattr_size(struct inode *inode, u64 newsize) if (ret) return ret; + ret = get_write_access(inode); + if (ret) + return ret; + inode_dio_wait(inode); ret = gfs2_rs_alloc(GFS2_I(inode)); if (ret) - return ret; + goto out; oldsize = inode->i_size; - if (newsize >= oldsize) - return do_grow(inode, newsize); + if (newsize >= oldsize) { + ret = do_grow(inode, newsize); + goto out; + } - return do_shrink(inode, oldsize, newsize); + ret = do_shrink(inode, oldsize, newsize); +out: + put_write_access(inode); + return ret; } int gfs2_truncatei_resume(struct gfs2_inode *ip) |