irq_work: Optimize irq_work_single()

[linux-2.6-microblaze.git] / fs / nfs / sysfs.c

diff --git a/fs/nfs/sysfs.c b/fs/nfs/sysfs.c
index c489496..8cb7075 100644 (file)
--- a/fs/nfs/sysfs.c
+++ b/fs/nfs/sysfs.c
@@ -79,7 +79,12 @@ static ssize_t nfs_netns_identifier_show(struct kobject *kobj,
        struct nfs_netns_client *c = container_of(kobj,
                        struct nfs_netns_client,
                        kobject);
-       return scnprintf(buf, PAGE_SIZE, "%s\n", c->identifier);
+       ssize_t ret;
+
+       rcu_read_lock();
+       ret = scnprintf(buf, PAGE_SIZE, "%s\n", rcu_dereference(c->identifier));
+       rcu_read_unlock();
+       return ret;
 }
 
 /* Strip trailing '\n' */
@@ -107,7 +112,7 @@ static ssize_t nfs_netns_identifier_store(struct kobject *kobj,
        p = kmemdup_nul(buf, len, GFP_KERNEL);
        if (!p)
                return -ENOMEM;
-       old = xchg(&c->identifier, p);
+       old = rcu_dereference_protected(xchg(&c->identifier, (char __rcu *)p), 1);
        if (old) {
                synchronize_rcu();
                kfree(old);
@@ -121,7 +126,7 @@ static void nfs_netns_client_release(struct kobject *kobj)
                        struct nfs_netns_client,
                        kobject);
 
-       kfree(c->identifier);
+       kfree(rcu_dereference_raw(c->identifier));
        kfree(c);
 }