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

diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c
index 39def020a074b7fab442f60216916ae3c3ac6a7b..cdb99507ef33d6e2c6e358d28ce2859260684506 100644 (file)
--- 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 649f04f112dc259c4682c09c241931f8900e15a6..59c32c9b799fcccc5bc77a84153c7a62e432141e 100644 (file)
--- 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;
                }