sysfs: use iget_locked() instead of new_inode()

After dentry is reclaimed, sysfs always used to allocate new dentry
and inode if the file is accessed again.  This causes problem with
operations which only pin the inode.  For example, if inotify watch is
added to a sysfs file and the dentry for the file is reclaimed, the
next update event creates new dentry and new inode making the inotify
watch miss all the events from there on.

This patch fixes it by using iget_locked() instead of new_inode().
sysfs_new_inode() is renamed to sysfs_get_inode() and inode is
initialized iff the inode is newly allocated.  sysfs_instantiate() is
responsible for unlocking new inodes.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 21 insertions, 16 deletions

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index bbf3525fd222..06dff2c30c9b 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -219,14 +219,16 @@ static int create_dir(struct kobject *kobj, struct dentry *parent,
                 goto out_drop;
         sd->s_elem.dir.kobj = kobj;
 
-        inode = sysfs_new_inode(sd);
+        inode = sysfs_get_inode(sd);
         if (!inode)
                 goto out_sput;
 
-        inode->i_op = &sysfs_dir_inode_operations;
-        inode->i_fop = &sysfs_dir_operations;
-        /* directory inodes start off with i_nlink == 2 (for "." entry) */
-        inc_nlink(inode);
+        if (inode->i_state & I_NEW) {
+                inode->i_op = &sysfs_dir_inode_operations;
+                inode->i_fop = &sysfs_dir_operations;
+                /* directory inodes start off with i_nlink == 2 (for ".") */
+                inc_nlink(inode);
+        }
 
         /* link in */
         error = -EEXIST;
@@ -310,20 +312,23 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
                 return NULL;
 
         /* attach dentry and inode */
-        inode = sysfs_new_inode(sd);
+        inode = sysfs_get_inode(sd);
         if (!inode)
                 return ERR_PTR(-ENOMEM);
 
-        /* initialize inode according to type */
-        if (sd->s_type & SYSFS_KOBJ_ATTR) {
-                inode->i_size = PAGE_SIZE;
-                inode->i_fop = &sysfs_file_operations;
-        } else if (sd->s_type & SYSFS_KOBJ_BIN_ATTR) {
-                struct bin_attribute *bin_attr = sd->s_elem.bin_attr.bin_attr;
-                inode->i_size = bin_attr->size;
-                inode->i_fop = &bin_fops;
-        } else if (sd->s_type & SYSFS_KOBJ_LINK)
-                inode->i_op = &sysfs_symlink_inode_operations;
+        if (inode->i_state & I_NEW) {
+                /* initialize inode according to type */
+                if (sd->s_type & SYSFS_KOBJ_ATTR) {
+                        inode->i_size = PAGE_SIZE;
+                        inode->i_fop = &sysfs_file_operations;
+                } else if (sd->s_type & SYSFS_KOBJ_BIN_ATTR) {
+                        struct bin_attribute *bin_attr =
+                                sd->s_elem.bin_attr.bin_attr;
+                        inode->i_size = bin_attr->size;
+                        inode->i_fop = &bin_fops;
+                } else if (sd->s_type & SYSFS_KOBJ_LINK)
+                        inode->i_op = &sysfs_symlink_inode_operations;
+        }
 
         sysfs_instantiate(dentry, inode);
         sysfs_attach_dentry(sd, dentry);