diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-06 17:44:28 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-06 17:44:28 +0800 |
| commit | d083f580e5b940834a93ab741cdf064f0324dc0f (patch) | |
| tree | d034075e47d68179d2f8bf7220d26bef0ba740d3 /fs/pipe.c | |
| parent | 931f27c6e892fdfe98896055e0df7962e21969d9 (diff) | |
| parent | 13ff50c85846338bb9820abd3933227b678dc086 (diff) | |
Merge tag 'parse-val' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into asoc-core
regmap: Add parse_val() API
This is useful for generic code built on top of regmap dealing with
blocks of data.
Diffstat (limited to 'fs/pipe.c')
| -rw-r--r-- | fs/pipe.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/pipe.c b/fs/pipe.c index 0e0752ef2715..78fd0d0788db 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; } |