summaryrefslogtreecommitdiff
path: root/fs/hfs
diff options
context:
space:
mode:
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>2017-05-08 15:58:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-08 17:15:14 -0700
commitc718a97514e4d77c97a35734b728aaf541a0621b (patch)
treeee3ecc300b4f02c8e27af51a24607068b54a0f61 /fs/hfs
parentf44a2920c84af809883ecbbd08d47fb5fe47c8ad (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.c4
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)
/* XXX: Can use generic_cont_expand? */
size = inode->i_size - 1;
- res = pagecache_write_begin(NULL, mapping, size+1, 0,
- AOP_FLAG_UNINTERRUPTIBLE, &page, &fsdata);
+ res = pagecache_write_begin(NULL, mapping, size+1, 0, 0,
+ &page, &fsdata);
if (!res) {
res = pagecache_write_end(NULL, mapping, size+1, 0, 0,
page, fsdata);
ntel/commit/drivers/pcmcia/cistpl.c?h=88910&id=a8408c17d0038b76a83affb1b56dc18fa1e7ed86'>pcmcia: avoid late calls to pccard_validate_cisDominik Brodowski1-2/+7 2010-03-03pcmcia: CodingStyle fixesDominik Brodowski1-968/+940 2010-02-17pcmcia: use read_cis_mem return valueDominik Brodowski1-19/+44 2010-02-17pcmcia: add locking to pcmcia_{read,write}_cis_memDominik Brodowski1-6/+21 2010-02-17pcmcia: delay re-scanning and re-querying of PCMCIA busDominik Brodowski1-9/+1 2010-02-17pcmcia: also lock fake and cache CIS by ops_mutexDominik Brodowski1-1/+17 2010-02-17pcmcia: add locking to set_mem_map()Dominik Brodowski1-0/+6 2010-02-17pcmcia: move cistpl.c into pcmcia moduleDominik Brodowski1-12/+146 2010-01-17pcmcia: CardBus doesn't need CIS accessDominik Brodowski1-168/+32 2010-01-17pcmcia: improve check for same card in slot after resumeDominik Brodowski1-0/+1 2010-01-17pcmcia: cleanup pccard_validate_cis()Dominik Brodowski1-74/+81 2010-01-17pcmcia: validate CIS, not CIS cache.Dominik Brodowski1-8/+16 2009-12-07pcmcia: CodingStyle fixesDominik Brodowski1-74/+107 2009-11-08pcmcia: use dynamic debug instead of custom infrastructureDominik Brodowski1-5/+5 2009-11-08pcmcia: add new CIS access helpersDominik Brodowski1-0/+61 2009-10-19pcmcia: pccard_read_tuple and TUPLE_RETURN_COMMON cleanupDominik Brodowski1-9/+11