From e77e43003382e46c673c9f82b5f2df8058d3c527 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 16 Jun 2013 17:25:12 +0400 Subject: more open-coded file_inode() calls Signed-off-by: Al Viro --- drivers/staging/android/logger.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/staging') diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c index 9bd874789ce5..080abf2faf97 100644 --- a/drivers/staging/android/logger.c +++ b/drivers/staging/android/logger.c @@ -696,7 +696,7 @@ static long logger_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ret = -EBADF; break; } - if (!(in_egroup_p(file->f_dentry->d_inode->i_gid) || + if (!(in_egroup_p(file_inode(file)->i_gid) || capable(CAP_SYSLOG))) { ret = -EPERM; break; -- cgit v1.2.3-59-g8ed1b From a44f52096c0b35214953124754dc034a889dc3b0 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 16 Jun 2013 19:05:07 +0400 Subject: comedi: quit wanking with FASYNC in ->release() Signed-off-by: Al Viro --- drivers/staging/comedi/comedi_fops.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'drivers/staging') diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 924c54c9c31f..a9754e84eb8a 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -2317,9 +2317,6 @@ static int comedi_close(struct inode *inode, struct file *file) mutex_unlock(&dev->mutex); - if (file->f_flags & FASYNC) - comedi_fasync(-1, file, 0); - return 0; } -- cgit v1.2.3-59-g8ed1b