diff options
| author | Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> | 2017-05-08 18:58:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-08 20:15:14 -0400 |
| commit | c718a97514e4d77c97a35734b728aaf541a0621b (patch) | |
| tree | ee3ecc300b4f02c8e27af51a24607068b54a0f61 /fs/hfs | |
| parent | f44a2920c84af809883ecbbd08d47fb5fe47c8ad (diff) | |
fs: semove set but not checked AOP_FLAG_UNINTERRUPTIBLE flag
Commit afddba49d18f ("fs: introduce write_begin, write_end, and
perform_write aops") introduced AOP_FLAG_UNINTERRUPTIBLE flag which was
checked in pagecache_write_begin(), but that check was removed by
4e02ed4b4a2f ("fs: remove prepare_write/commit_write").
Between these two commits, commit d9414774dc0c ("cifs: Convert cifs to
new aops.") added a check in cifs_write_begin(), but that check was soon
removed by commit a98ee8c1c707 ("[CIFS] fix regression in
cifs_write_begin/cifs_write_end").
Therefore, AOP_FLAG_UNINTERRUPTIBLE flag is checked nowhere. Let's
remove this flag. This patch has no functionality changes.
Link: http://lkml.kernel.org/r/1489294781-53494-1-git-send-email-penguin-kernel@I-love.SAKURA.ne.jp
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Nick Piggin <npiggin@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/hfs')
| -rw-r--r-- | fs/hfs/extent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/hfs/extent.c b/fs/hfs/extent.c index e33a0d36a93e..5d0182654580 100644 --- a/fs/hfs/extent.c +++ b/fs/hfs/extent.c | |||
| @@ -485,8 +485,8 @@ void hfs_file_truncate(struct inode *inode) | |||
| 485 | 485 | ||
| 486 | /* XXX: Can use generic_cont_expand? */ | 486 | /* XXX: Can use generic_cont_expand? */ |
| 487 | size = inode->i_size - 1; | 487 | size = inode->i_size - 1; |
| 488 | res = pagecache_write_begin(NULL, mapping, size+1, 0, | 488 | res = pagecache_write_begin(NULL, mapping, size+1, 0, 0, |
| 489 | AOP_FLAG_UNINTERRUPTIBLE, &page, &fsdata); | 489 | &page, &fsdata); |
| 490 | if (!res) { | 490 | if (!res) { |
| 491 | res = pagecache_write_end(NULL, mapping, size+1, 0, 0, | 491 | res = pagecache_write_end(NULL, mapping, size+1, 0, 0, |
| 492 | page, fsdata); | 492 | page, fsdata); |
