Commit e22e9832 authored by Linus Torvalds's avatar Linus Torvalds

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

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
parents a48b0872 f8b139e2
...@@ -583,7 +583,7 @@ static struct attribute *v9fs_attrs[] = { ...@@ -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,
}; };
......
...@@ -86,8 +86,8 @@ int v9fs_file_open(struct inode *inode, struct file *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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment