openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Renames num_open to is_open, as only one process can open the file at a time. 

Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Cc: "Serge E. Hallyn" <serue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
Rajiv Andrade 2008-10-11 09:04:02 +11:00 committed by James Morris
parent f89c5edb86
commit dc36d32cc5
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/char/tpm/tpm.c
View File

@ -978,20 +978,19 @@ int tpm_open(struct inode *inode, struct file *file)
goto err_out; goto err_out;
} }
if (chip->num_opens) { if (test_and_set_bit(0, &chip->is_open)) {
dev_dbg(chip->dev, "Another process owns this TPM\n"); dev_dbg(chip->dev, "Another process owns this TPM\n");
rc = -EBUSY; rc = -EBUSY;
goto err_out; goto err_out;
} }
chip->num_opens++;
get_device(chip->dev); get_device(chip->dev);
spin_unlock(&driver_lock); spin_unlock(&driver_lock);
chip->data_buffer = kmalloc(TPM_BUFSIZE * sizeof(u8), GFP_KERNEL); chip->data_buffer = kmalloc(TPM_BUFSIZE * sizeof(u8), GFP_KERNEL);
if (chip->data_buffer == NULL) { if (chip->data_buffer == NULL) {
chip->num_opens--; clear_bit(0, &chip->is_open);
put_device(chip->dev); put_device(chip->dev);
return -ENOMEM; return -ENOMEM;
} }
@ -1016,7 +1015,7 @@ int tpm_release(struct inode *inode, struct file *file)
file->private_data = NULL; file->private_data = NULL;
del_singleshot_timer_sync(&chip->user_read_timer); del_singleshot_timer_sync(&chip->user_read_timer);
atomic_set(&chip->data_pending, 0); atomic_set(&chip->data_pending, 0);
chip->num_opens--; clear_bit(0, &chip->is_open);
put_device(chip->dev); put_device(chip->dev);
kfree(chip->data_buffer); kfree(chip->data_buffer);
spin_unlock(&driver_lock); spin_unlock(&driver_lock);

2
drivers/char/tpm/tpm.h
View File

@ -90,7 +90,7 @@ struct tpm_chip {
struct device *dev; /* Device stuff */ struct device *dev; /* Device stuff */
int dev_num; /* /dev/tpm# */ int dev_num; /* /dev/tpm# */
int num_opens; /* only one allowed */ unsigned long is_open; /* only one allowed */
int time_expired; int time_expired;
/* Data passed to and from the tpm via the read/write calls */ /* Data passed to and from the tpm via the read/write calls */