diff options
Diffstat (limited to 'fs/sysfs')
-rw-r--r-- | fs/sysfs/inode.c | 6 | ||||
-rw-r--r-- | fs/sysfs/sysfs.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c index 0a12eb89cd3..e3f091a81c7 100644 --- a/fs/sysfs/inode.c +++ b/fs/sysfs/inode.c | |||
@@ -349,11 +349,11 @@ int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const void *ns, const cha | |||
349 | return -ENOENT; | 349 | return -ENOENT; |
350 | } | 350 | } |
351 | 351 | ||
352 | int sysfs_permission(struct inode *inode, int mask, unsigned int flags) | 352 | int sysfs_permission(struct inode *inode, int mask) |
353 | { | 353 | { |
354 | struct sysfs_dirent *sd; | 354 | struct sysfs_dirent *sd; |
355 | 355 | ||
356 | if (flags & IPERM_FLAG_RCU) | 356 | if (mask & MAY_NOT_BLOCK) |
357 | return -ECHILD; | 357 | return -ECHILD; |
358 | 358 | ||
359 | sd = inode->i_private; | 359 | sd = inode->i_private; |
@@ -362,5 +362,5 @@ int sysfs_permission(struct inode *inode, int mask, unsigned int flags) | |||
362 | sysfs_refresh_inode(sd, inode); | 362 | sysfs_refresh_inode(sd, inode); |
363 | mutex_unlock(&sysfs_mutex); | 363 | mutex_unlock(&sysfs_mutex); |
364 | 364 | ||
365 | return generic_permission(inode, mask, flags, NULL); | 365 | return generic_permission(inode, mask); |
366 | } | 366 | } |
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h index 2ed2404f311..845ab3ad229 100644 --- a/fs/sysfs/sysfs.h +++ b/fs/sysfs/sysfs.h | |||
@@ -201,7 +201,7 @@ static inline void __sysfs_put(struct sysfs_dirent *sd) | |||
201 | struct inode *sysfs_get_inode(struct super_block *sb, struct sysfs_dirent *sd); | 201 | struct inode *sysfs_get_inode(struct super_block *sb, struct sysfs_dirent *sd); |
202 | void sysfs_evict_inode(struct inode *inode); | 202 | void sysfs_evict_inode(struct inode *inode); |
203 | int sysfs_sd_setattr(struct sysfs_dirent *sd, struct iattr *iattr); | 203 | int sysfs_sd_setattr(struct sysfs_dirent *sd, struct iattr *iattr); |
204 | int sysfs_permission(struct inode *inode, int mask, unsigned int flags); | 204 | int sysfs_permission(struct inode *inode, int mask); |
205 | int sysfs_setattr(struct dentry *dentry, struct iattr *iattr); | 205 | int sysfs_setattr(struct dentry *dentry, struct iattr *iattr); |
206 | int sysfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat); | 206 | int sysfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat); |
207 | int sysfs_setxattr(struct dentry *dentry, const char *name, const void *value, | 207 | int sysfs_setxattr(struct dentry *dentry, const char *name, const void *value, |