VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2021-05-07 11:18:52 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2021-05-07 11:18:52 -0700 commit: e22e9832798df81393d09d40fa34b01aea53cf39 parent: a48b0872e69428d3d02994dcfad3519f01def7fa

Commit Summary:

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

Diffstat:

2 files changed, 3 insertions, 3 deletions

diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c
index 39def020a074..cdb99507ef33 100644
--- a/fs/9p/v9fs.c
+++ b/fs/9p/v9fs.c
@@ -583,7 +583,7 @@ static struct attribute *v9fs_attrs[] = {
 	NULL,
 };
 
-static struct attribute_group v9fs_attr_group = {
+static const struct attribute_group v9fs_attr_group = {
 	.attrs = v9fs_attrs,
 };
 
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 649f04f112dc..59c32c9b799f 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -86,8 +86,8 @@ int v9fs_file_open(struct inode *inode, struct file *file)
 		 * to work.
 		 */
 		writeback_fid = v9fs_writeback_fid(file_dentry(file));
-		if (IS_ERR(fid)) {
-			err = PTR_ERR(fid);
+		if (IS_ERR(writeback_fid)) {
+			err = PTR_ERR(writeback_fid);
 			mutex_unlock(&v9inode->v_mutex);
 			goto out_error;
 		}