Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-1222 ldlm: Fix the race in AST sender vs multiple arriving RPCs
[fs/lustre-release.git]
/
lustre
/
fld
/
lproc_fld.c
diff --git
a/lustre/fld/lproc_fld.c
b/lustre/fld/lproc_fld.c
index
b2e37fd
..
a2e02fa
100644
(file)
--- a/
lustre/fld/lproc_fld.c
+++ b/
lustre/fld/lproc_fld.c
@@
-26,7
+26,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-73,9
+73,9
@@
fld_proc_read_targets(char *page, char **start, off_t off,
LASSERT(fld != NULL);
LASSERT(fld != NULL);
- spin_lock(&fld->lcf_lock);
- list_for_each_entry(target,
- &fld->lcf_targets, ft_chain)
+
cfs_
spin_lock(&fld->lcf_lock);
+
cfs_
list_for_each_entry(target,
+
&fld->lcf_targets, ft_chain)
{
rc = snprintf(page, count, "%s\n",
fld_target_name(target));
{
rc = snprintf(page, count, "%s\n",
fld_target_name(target));
@@
-85,7
+85,7
@@
fld_proc_read_targets(char *page, char **start, off_t off,
if (count == 0)
break;
}
if (count == 0)
break;
}
- spin_unlock(&fld->lcf_lock);
+
cfs_
spin_unlock(&fld->lcf_lock);
RETURN(total);
}
RETURN(total);
}
@@
-99,10
+99,10
@@
fld_proc_read_hash(char *page, char **start, off_t off,
LASSERT(fld != NULL);
LASSERT(fld != NULL);
- spin_lock(&fld->lcf_lock);
+
cfs_
spin_lock(&fld->lcf_lock);
rc = snprintf(page, count, "%s\n",
fld->lcf_hash->fh_name);
rc = snprintf(page, count, "%s\n",
fld->lcf_hash->fh_name);
- spin_unlock(&fld->lcf_lock);
+
cfs_
spin_unlock(&fld->lcf_lock);
RETURN(rc);
}
RETURN(rc);
}
@@
-129,9
+129,9
@@
fld_proc_write_hash(struct file *file, const char *buffer,
}
if (hash != NULL) {
}
if (hash != NULL) {
- spin_lock(&fld->lcf_lock);
+
cfs_
spin_lock(&fld->lcf_lock);
fld->lcf_hash = hash;
fld->lcf_hash = hash;
- spin_unlock(&fld->lcf_lock);
+
cfs_
spin_unlock(&fld->lcf_lock);
CDEBUG(D_INFO, "%s: Changed hash to \"%s\"\n",
fld->lcf_name, hash->fh_name);
CDEBUG(D_INFO, "%s: Changed hash to \"%s\"\n",
fld->lcf_name, hash->fh_name);