diff options
author | Maxim Shchetynin <maxim@de.ibm.com> | 2008-04-01 09:12:20 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-04-03 07:11:11 -0400 |
commit | 7484839850d826e14b8b024bb048dca8489140ae (patch) | |
tree | 1fefb0a1417996a5db9de794dd344d7173bbc078 | |
parent | b991f05f1326fd9e6212851d0f2099875906dd16 (diff) |
[POWERPC] Fix rtas_flash procfs interface
Handling of the proc_dir_entry->count was changed in 2.6.24-rc5.
After this change, the default value for pde->count is 1 and not 0 as
before. Therefore, if we want to check whether our procfs file is
already opened (already in use), we have to check if pde->count is
greater than 2 rather than 1.
Signed-off-by: Maxim Shchetynin <maxim@de.ibm.com>
Signed-off-by: Jens Osterkamp <jens@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/kernel/rtas_flash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c index f2276593f416..538baf46f15f 100644 --- a/arch/powerpc/kernel/rtas_flash.c +++ b/arch/powerpc/kernel/rtas_flash.c | |||
@@ -356,7 +356,7 @@ static int rtas_excl_open(struct inode *inode, struct file *file) | |||
356 | 356 | ||
357 | /* Enforce exclusive open with use count of PDE */ | 357 | /* Enforce exclusive open with use count of PDE */ |
358 | spin_lock(&flash_file_open_lock); | 358 | spin_lock(&flash_file_open_lock); |
359 | if (atomic_read(&dp->count) > 1) { | 359 | if (atomic_read(&dp->count) > 2) { |
360 | spin_unlock(&flash_file_open_lock); | 360 | spin_unlock(&flash_file_open_lock); |
361 | return -EBUSY; | 361 | return -EBUSY; |
362 | } | 362 | } |