X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=fs%2Fpipe.c;h=78fd0d0788dbc465c3d7a6ba674bb64a6ebea25d;hb=ac9dc67b730f3a1d10c5abbf91ed773d1e277646;hp=0e0752ef27159f6183dabc1749e49fca8494319a;hpb=825e587af2e90e9b953849f3347a01d8f383d577;p=~andy%2Flinux

diff --git a/fs/pipe.c b/fs/pipe.c
index 0e0752ef271..78fd0d0788d 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -663,10 +663,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;
 }