From: Kentaro Makita Fix coding style at dcache.c. No behavior changed. Signed-off-by: Kentaro Makita Cc: Al Viro Signed-off-by: Andrew Morton --- fs/dcache.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff -puN fs/dcache.c~vfs-fix-coding-style-in-dcachec fs/dcache.c --- a/fs/dcache.c~vfs-fix-coding-style-in-dcachec +++ a/fs/dcache.c @@ -455,15 +455,15 @@ static void __shrink_dcache_sb(struct su int cnt = 0; BUG_ON(!sb); - BUG_ON((flags & DCACHE_REFERENCED) && count == NULL); + BUG_ON((flags & DCACHE_REFERENCED) && !count); spin_lock(&dcache_lock); - if (count != NULL) + if (count) /* called from prune_dcache() and shrink_dcache_parent() */ cnt = *count; restart: - if (count == NULL) + if (!count) { list_splice_init(&sb->s_dentry_lru, &tmp); - else { + } else { while (!list_empty(&sb->s_dentry_lru)) { dentry = list_entry(sb->s_dentry_lru.prev, struct dentry, d_lru); @@ -475,16 +475,15 @@ restart: * the dentry has this flag set, don't free it. Clear * the flag and put it back on the LRU. */ - if ((flags & DCACHE_REFERENCED) - && (dentry->d_flags & DCACHE_REFERENCED)) { + if ((flags & DCACHE_REFERENCED) && + (dentry->d_flags & DCACHE_REFERENCED)) { dentry->d_flags &= ~DCACHE_REFERENCED; list_move_tail(&dentry->d_lru, &referenced); spin_unlock(&dentry->d_lock); } else { list_move_tail(&dentry->d_lru, &tmp); spin_unlock(&dentry->d_lock); - cnt--; - if (!cnt) + if (--cnt == 0) break; } } @@ -506,10 +505,10 @@ restart: /* dentry->d_lock was dropped in prune_one_dentry() */ cond_resched_lock(&dcache_lock); } - if (count == NULL && !list_empty(&sb->s_dentry_lru)) - goto restart; - if (count != NULL) + if (count) *count = cnt; + else if (!list_empty(&sb->s_dentry_lru)) + goto restart; if (!list_empty(&referenced)) list_splice(&referenced, &sb->s_dentry_lru); spin_unlock(&dcache_lock); _