diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-14 17:04:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-14 17:04:19 -0800 |
| commit | 7d1fc01afc5af35e5197e0e75abe900f6bd279b8 (patch) | |
| tree | 4bebc92c83785335e132059d9965c8f9c0a03670 /fs/super.c | |
| parent | 0f0836b7eb1b9d14862ee40c7856227a3ead70db (diff) | |
| parent | bcf4299e6215a475259c3ac329d43e776cfe9c0c (diff) | |
| download | linux-7d1fc01afc5af35e5197e0e75abe900f6bd279b8.tar.gz linux-7d1fc01afc5af35e5197e0e75abe900f6bd279b8.tar.bz2 linux-7d1fc01afc5af35e5197e0e75abe900f6bd279b8.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
floppy: make local variable non-static
exynos: fixes an incorrect header guard
dt-bindings: fixes some incorrect header guards
cpufreq-dt: correct dead link in documentation
cpufreq: ARM big LITTLE: correct dead link in documentation
treewide: Fix typos in printk
Documentation: filesystem: Fix typo in fs/eventfd.c
fs/super.c: use && instead of & for warn_on condition
Documentation: fix sysfs-ptp
lib: scatterlist: fix Kconfig description
Diffstat (limited to 'fs/super.c')
| -rw-r--r-- | fs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/super.c b/fs/super.c index cc658a20a29e..1182af8fd5ff 100644 --- a/fs/super.c +++ b/fs/super.c @@ -1197,7 +1197,7 @@ int __sb_start_write(struct super_block *sb, int level, bool wait) else ret = percpu_down_read_trylock(sb->s_writers.rw_sem + level-1); - WARN_ON(force_trylock & !ret); + WARN_ON(force_trylock && !ret); return ret; } EXPORT_SYMBOL(__sb_start_write); |