moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag '9p-for-5.13-rc1' of git://github.com/martinetd/linux

Browse Source 
Pull 9p updates from Dominique Martinet:
 "An error handling fix and constification"

* tag '9p-for-5.13-rc1' of git://github.com/martinetd/linux:
  fs: 9p: fix v9fs_file_open writeback fid error check
  9p: Constify static struct v9fs_attr_group
This commit is contained in:
Linus Torvalds
2021-05-07 11:18:52 -07:00
parent a48b0872e6 f8b139e2f2
commit e22e983279
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/9p/v9fs.c
View File

@@ -583,7 +583,7 @@ static struct attribute *v9fs_attrs[] = {
NULL, NULL,
}; };
static struct attribute_group v9fs_attr_group = { static const struct attribute_group v9fs_attr_group = {
.attrs = v9fs_attrs, .attrs = v9fs_attrs,
}; };

4
fs/9p/vfs_file.c
View File

@@ -86,8 +86,8 @@ int v9fs_file_open(struct inode *inode, struct file *file)
* to work. * to work.
*/ */
writeback_fid = v9fs_writeback_fid(file_dentry(file)); writeback_fid = v9fs_writeback_fid(file_dentry(file));
if (IS_ERR(fid)) { if (IS_ERR(writeback_fid)) {
err = PTR_ERR(fid); err = PTR_ERR(writeback_fid);
mutex_unlock(&v9inode->v_mutex); mutex_unlock(&v9inode->v_mutex);
goto out_error; goto out_error;
} }