projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'work.xattr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[cascardo/linux.git]
/
fs
/
orangefs
/
namei.c
diff --git
a/fs/orangefs/namei.c
b/fs/orangefs/namei.c
index
ccca518
..
4d5576a
100644
(file)
--- a/
fs/orangefs/namei.c
+++ b/
fs/orangefs/namei.c
@@
-24,9
+24,9
@@
static int orangefs_create(struct inode *dir,
struct inode *inode;
int ret;
struct inode *inode;
int ret;
- gossip_debug(GOSSIP_NAME_DEBUG, "%s: %
s
\n",
+ gossip_debug(GOSSIP_NAME_DEBUG, "%s: %
pd
\n",
__func__,
__func__,
- dentry
->d_name.name
);
+ dentry);
new_op = op_alloc(ORANGEFS_VFS_OP_CREATE);
if (!new_op)
new_op = op_alloc(ORANGEFS_VFS_OP_CREATE);
if (!new_op)
@@
-43,9
+43,9
@@
static int orangefs_create(struct inode *dir,
ret = service_operation(new_op, __func__, get_interruptible_flag(dir));
gossip_debug(GOSSIP_NAME_DEBUG,
ret = service_operation(new_op, __func__, get_interruptible_flag(dir));
gossip_debug(GOSSIP_NAME_DEBUG,
- "%s: %
s
: handle:%pU: fsid:%d: new_op:%p: ret:%d:\n",
+ "%s: %
pd
: handle:%pU: fsid:%d: new_op:%p: ret:%d:\n",
__func__,
__func__,
- dentry
->d_name.name
,
+ dentry,
&new_op->downcall.resp.create.refn.khandle,
new_op->downcall.resp.create.refn.fs_id,
new_op,
&new_op->downcall.resp.create.refn.khandle,
new_op->downcall.resp.create.refn.fs_id,
new_op,
@@
-57,28
+57,28
@@
static int orangefs_create(struct inode *dir,
inode = orangefs_new_inode(dir->i_sb, dir, S_IFREG | mode, 0,
&new_op->downcall.resp.create.refn);
if (IS_ERR(inode)) {
inode = orangefs_new_inode(dir->i_sb, dir, S_IFREG | mode, 0,
&new_op->downcall.resp.create.refn);
if (IS_ERR(inode)) {
- gossip_err("%s: Failed to allocate inode for file :%
s
:\n",
+ gossip_err("%s: Failed to allocate inode for file :%
pd
:\n",
__func__,
__func__,
- dentry
->d_name.name
);
+ dentry);
ret = PTR_ERR(inode);
goto out;
}
gossip_debug(GOSSIP_NAME_DEBUG,
ret = PTR_ERR(inode);
goto out;
}
gossip_debug(GOSSIP_NAME_DEBUG,
- "%s: Assigned inode :%pU: for file :%
s
:\n",
+ "%s: Assigned inode :%pU: for file :%
pd
:\n",
__func__,
get_khandle_from_ino(inode),
__func__,
get_khandle_from_ino(inode),
- dentry
->d_name.name
);
+ dentry);
d_instantiate(dentry, inode);
unlock_new_inode(inode);
d_instantiate(dentry, inode);
unlock_new_inode(inode);
- dentry->d_time = jiffies + dcache_timeout_msecs*HZ/1000;
+ dentry->d_time = jiffies +
orangefs_
dcache_timeout_msecs*HZ/1000;
ORANGEFS_I(inode)->getattr_time = jiffies - 1;
gossip_debug(GOSSIP_NAME_DEBUG,
ORANGEFS_I(inode)->getattr_time = jiffies - 1;
gossip_debug(GOSSIP_NAME_DEBUG,
- "%s: dentry instantiated for %
s
\n",
+ "%s: dentry instantiated for %
pd
\n",
__func__,
__func__,
- dentry
->d_name.name
);
+ dentry);
SetMtimeFlag(parent);
dir->i_mtime = dir->i_ctime = current_fs_time(dir->i_sb);
SetMtimeFlag(parent);
dir->i_mtime = dir->i_ctime = current_fs_time(dir->i_sb);
@@
-87,9
+87,9
@@
static int orangefs_create(struct inode *dir,
out:
op_release(new_op);
gossip_debug(GOSSIP_NAME_DEBUG,
out:
op_release(new_op);
gossip_debug(GOSSIP_NAME_DEBUG,
- "%s: %
s
: returning %d\n",
+ "%s: %
pd
: returning %d\n",
__func__,
__func__,
- dentry
->d_name.name
,
+ dentry,
ret);
return ret;
}
ret);
return ret;
}
@@
-115,8
+115,8
@@
static struct dentry *orangefs_lookup(struct inode *dir, struct dentry *dentry,
* -EEXIST on O_EXCL opens, which is broken if we skip this lookup
* in the create path)
*/
* -EEXIST on O_EXCL opens, which is broken if we skip this lookup
* in the create path)
*/
- gossip_debug(GOSSIP_NAME_DEBUG, "%s called on %
s
\n",
- __func__, dentry
->d_name.name
);
+ gossip_debug(GOSSIP_NAME_DEBUG, "%s called on %
pd
\n",
+ __func__, dentry);
if (dentry->d_name.len > (ORANGEFS_NAME_MAX - 1))
return ERR_PTR(-ENAMETOOLONG);
if (dentry->d_name.len > (ORANGEFS_NAME_MAX - 1))
return ERR_PTR(-ENAMETOOLONG);
@@
-169,9
+169,9
@@
static struct dentry *orangefs_lookup(struct inode *dir, struct dentry *dentry,
gossip_debug(GOSSIP_NAME_DEBUG,
"orangefs_lookup: Adding *negative* dentry "
gossip_debug(GOSSIP_NAME_DEBUG,
"orangefs_lookup: Adding *negative* dentry "
- "%p for %
s
\n",
+ "%p for %
pd
\n",
dentry,
dentry,
- dentry
->d_name.name
);
+ dentry);
d_add(dentry, NULL);
res = NULL;
d_add(dentry, NULL);
res = NULL;
@@
-183,7
+183,7
@@
static struct dentry *orangefs_lookup(struct inode *dir, struct dentry *dentry,
goto out;
}
goto out;
}
- dentry->d_time = jiffies + dcache_timeout_msecs*HZ/1000;
+ dentry->d_time = jiffies +
orangefs_
dcache_timeout_msecs*HZ/1000;
inode = orangefs_iget(dir->i_sb, &new_op->downcall.resp.lookup.refn);
if (IS_ERR(inode)) {
inode = orangefs_iget(dir->i_sb, &new_op->downcall.resp.lookup.refn);
if (IS_ERR(inode)) {
@@
-224,10
+224,10
@@
static int orangefs_unlink(struct inode *dir, struct dentry *dentry)
int ret;
gossip_debug(GOSSIP_NAME_DEBUG,
int ret;
gossip_debug(GOSSIP_NAME_DEBUG,
- "%s: called on %
s
\n"
+ "%s: called on %
pd
\n"
" (inode %pU): Parent is %pU | fs_id %d\n",
__func__,
" (inode %pU): Parent is %pU | fs_id %d\n",
__func__,
- dentry
->d_name.name
,
+ dentry,
get_khandle_from_ino(inode),
&parent->refn.khandle,
parent->refn.fs_id);
get_khandle_from_ino(inode),
&parent->refn.khandle,
parent->refn.fs_id);
@@
-322,13
+322,13
@@
static int orangefs_symlink(struct inode *dir,
d_instantiate(dentry, inode);
unlock_new_inode(inode);
d_instantiate(dentry, inode);
unlock_new_inode(inode);
- dentry->d_time = jiffies + dcache_timeout_msecs*HZ/1000;
+ dentry->d_time = jiffies +
orangefs_
dcache_timeout_msecs*HZ/1000;
ORANGEFS_I(inode)->getattr_time = jiffies - 1;
gossip_debug(GOSSIP_NAME_DEBUG,
ORANGEFS_I(inode)->getattr_time = jiffies - 1;
gossip_debug(GOSSIP_NAME_DEBUG,
- "Inode (Symlink) %pU -> %
s
\n",
+ "Inode (Symlink) %pU -> %
pd
\n",
get_khandle_from_ino(inode),
get_khandle_from_ino(inode),
- dentry
->d_name.name
);
+ dentry);
SetMtimeFlag(parent);
dir->i_mtime = dir->i_ctime = current_fs_time(dir->i_sb);
SetMtimeFlag(parent);
dir->i_mtime = dir->i_ctime = current_fs_time(dir->i_sb);
@@
-386,13
+386,13
@@
static int orangefs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode
d_instantiate(dentry, inode);
unlock_new_inode(inode);
d_instantiate(dentry, inode);
unlock_new_inode(inode);
- dentry->d_time = jiffies + dcache_timeout_msecs*HZ/1000;
+ dentry->d_time = jiffies +
orangefs_
dcache_timeout_msecs*HZ/1000;
ORANGEFS_I(inode)->getattr_time = jiffies - 1;
gossip_debug(GOSSIP_NAME_DEBUG,
ORANGEFS_I(inode)->getattr_time = jiffies - 1;
gossip_debug(GOSSIP_NAME_DEBUG,
- "Inode (Directory) %pU -> %
s
\n",
+ "Inode (Directory) %pU -> %
pd
\n",
get_khandle_from_ino(inode),
get_khandle_from_ino(inode),
- dentry
->d_name.name
);
+ dentry);
/*
* NOTE: we have no good way to keep nlink consistent for directories
/*
* NOTE: we have no good way to keep nlink consistent for directories