diff --git a/[refs] b/[refs] index 04153a790588..08bf20a70b05 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2b3e74b78b24cb367289a75a2bd30e569e56e0e +refs/heads/master: 3bc0ba4305fa99b32caac8c60df84a2f14fce228 diff --git a/trunk/fs/file_table.c b/trunk/fs/file_table.c index c3dee381f1b4..c3e89adf53c0 100644 --- a/trunk/fs/file_table.c +++ b/trunk/fs/file_table.c @@ -311,7 +311,7 @@ struct file *fget_light(unsigned int fd, int *fput_needed) struct files_struct *files = current->files; *fput_needed = 0; - if (likely((atomic_read(&files->count) == 1))) { + if (atomic_read(&files->count) == 1) { file = fcheck_files(files, fd); } else { rcu_read_lock();