git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
oprofile
/
oprofilefs.c
diff --git
a/drivers/oprofile/oprofilefs.c
b/drivers/oprofile/oprofilefs.c
index
d9746f1
..
d6bae69
100644
(file)
--- a/
drivers/oprofile/oprofilefs.c
+++ b/
drivers/oprofile/oprofilefs.c
@@
-21,7
+21,7
@@
#define OPROFILEFS_MAGIC 0x6f70726f
#define OPROFILEFS_MAGIC 0x6f70726f
-
spinlock_t oprofilefs_lock = SPIN_LOCK_UNLOCKED
;
+
DEFINE_SPINLOCK(oprofilefs_lock)
;
static struct inode * oprofilefs_get_inode(struct super_block * sb, int mode)
{
static struct inode * oprofilefs_get_inode(struct super_block * sb, int mode)
{
@@
-135,11
+135,8
@@
static struct dentry * __oprofilefs_create_file(struct super_block * sb,
{
struct dentry * dentry;
struct inode * inode;
{
struct dentry * dentry;
struct inode * inode;
- struct qstr qname;
- qname.name = name;
- qname.len = strlen(name);
- qname.hash = full_name_hash(qname.name, qname.len);
- dentry = d_alloc(root, &qname);
+
+ dentry = d_alloc_name(root, name);
if (!dentry)
return NULL;
inode = oprofilefs_get_inode(sb, S_IFREG | perm);
if (!dentry)
return NULL;
inode = oprofilefs_get_inode(sb, S_IFREG | perm);
@@
-228,11
+225,8
@@
struct dentry * oprofilefs_mkdir(struct super_block * sb,
{
struct dentry * dentry;
struct inode * inode;
{
struct dentry * dentry;
struct inode * inode;
- struct qstr qname;
- qname.name = name;
- qname.len = strlen(name);
- qname.hash = full_name_hash(qname.name, qname.len);
- dentry = d_alloc(root, &qname);
+
+ dentry = d_alloc_name(root, name);
if (!dentry)
return NULL;
inode = oprofilefs_get_inode(sb, S_IFDIR | 0755);
if (!dentry)
return NULL;
inode = oprofilefs_get_inode(sb, S_IFDIR | 0755);
@@
-256,6
+250,7
@@
static int oprofilefs_fill_super(struct super_block * sb, void * data, int silen
sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
sb->s_magic = OPROFILEFS_MAGIC;
sb->s_op = &s_ops;
sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
sb->s_magic = OPROFILEFS_MAGIC;
sb->s_op = &s_ops;
+ sb->s_time_gran = 1;
root_inode = oprofilefs_get_inode(sb, S_IFDIR | 0755);
if (!root_inode)
root_inode = oprofilefs_get_inode(sb, S_IFDIR | 0755);
if (!root_inode)