diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-22 15:40:57 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-22 18:04:28 -0500 |
commit | 5955102c9984fa081b2d570cfac75c97eecf8f3b (patch) | |
tree | a4744386eac4b916e847eb4eedfada158f6527b4 /fs/configfs/file.c | |
parent | 57b8f112cfe6622ddddb8c2641206bb5fa8a112d (diff) |
wrappers for ->i_mutex access
parallel to mutex_{lock,unlock,trylock,is_locked,lock_nested},
inode_foo(inode) being mutex_foo(&inode->i_mutex).
Please, use those for access to ->i_mutex; over the coming cycle
->i_mutex will become rwsem, with ->lookup() done with it held
only shared.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/configfs/file.c')
-rw-r--r-- | fs/configfs/file.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/configfs/file.c b/fs/configfs/file.c index 3687187c8ea5..33b7ee34eda5 100644 --- a/fs/configfs/file.c +++ b/fs/configfs/file.c | |||
@@ -540,10 +540,10 @@ int configfs_create_file(struct config_item * item, const struct configfs_attrib | |||
540 | umode_t mode = (attr->ca_mode & S_IALLUGO) | S_IFREG; | 540 | umode_t mode = (attr->ca_mode & S_IALLUGO) | S_IFREG; |
541 | int error = 0; | 541 | int error = 0; |
542 | 542 | ||
543 | mutex_lock_nested(&d_inode(dir)->i_mutex, I_MUTEX_NORMAL); | 543 | inode_lock_nested(d_inode(dir), I_MUTEX_NORMAL); |
544 | error = configfs_make_dirent(parent_sd, NULL, (void *) attr, mode, | 544 | error = configfs_make_dirent(parent_sd, NULL, (void *) attr, mode, |
545 | CONFIGFS_ITEM_ATTR); | 545 | CONFIGFS_ITEM_ATTR); |
546 | mutex_unlock(&d_inode(dir)->i_mutex); | 546 | inode_unlock(d_inode(dir)); |
547 | 547 | ||
548 | return error; | 548 | return error; |
549 | } | 549 | } |
@@ -562,10 +562,10 @@ int configfs_create_bin_file(struct config_item *item, | |||
562 | umode_t mode = (bin_attr->cb_attr.ca_mode & S_IALLUGO) | S_IFREG; | 562 | umode_t mode = (bin_attr->cb_attr.ca_mode & S_IALLUGO) | S_IFREG; |
563 | int error = 0; | 563 | int error = 0; |
564 | 564 | ||
565 | mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_NORMAL); | 565 | inode_lock_nested(dir->d_inode, I_MUTEX_NORMAL); |
566 | error = configfs_make_dirent(parent_sd, NULL, (void *) bin_attr, mode, | 566 | error = configfs_make_dirent(parent_sd, NULL, (void *) bin_attr, mode, |
567 | CONFIGFS_ITEM_BIN_ATTR); | 567 | CONFIGFS_ITEM_BIN_ATTR); |
568 | mutex_unlock(&dir->d_inode->i_mutex); | 568 | inode_unlock(dir->d_inode); |
569 | 569 | ||
570 | return error; | 570 | return error; |
571 | } | 571 | } |