Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753953AbcDVLGp (ORCPT ); Fri, 22 Apr 2016 07:06:45 -0400 Received: from mx2.suse.de ([195.135.220.15]:44224 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753589AbcDVLGi (ORCPT ); Fri, 22 Apr 2016 07:06:38 -0400 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dmitry Monakhov , Al Viro , Andrew Morton , Linus Torvalds , Jiri Slaby Subject: [PATCH 3.12 72/78] fs/pipe.c: skip file_update_time on frozen fs Date: Fri, 22 Apr 2016 13:05:55 +0200 Message-Id: <2ef2735ee6ce05b6d7f4c3ede1a33135270eb96c.1461323133.git.jslaby@suse.cz> X-Mailer: git-send-email 2.8.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1308 Lines: 43 From: Dmitry Monakhov 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit 7e775f46a125f894a1d71e96797c776dbec161f0 upstream. Pipe has no data associated with fs so it is not good idea to block pipe_write() if FS is frozen, but we can not update file's time on such filesystem. Let's use same idea as we use in touch_time(). Addresses https://bugzilla.kernel.org/show_bug.cgi?id=65701 Signed-off-by: Dmitry Monakhov Reviewed-by: Jan Kara Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Jiri Slaby --- fs/pipe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/pipe.c b/fs/pipe.c index c281867c453e..fff8057a0809 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -681,10 +681,11 @@ out: wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLRDNORM); kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN); } - if (ret > 0) { + if (ret > 0 && sb_start_write_trylock(file_inode(filp)->i_sb)) { int err = file_update_time(filp); if (err) ret = err; + sb_end_write(file_inode(filp)->i_sb); } return ret; } -- 2.8.1