git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into next
[sfrench/cifs-2.6.git]
/
net
/
sunrpc
/
rpc_pipe.c
diff --git
a/net/sunrpc/rpc_pipe.c
b/net/sunrpc/rpc_pipe.c
index 19245324887011f358adab5baa5a28d38811549f..9ced0628d69c35d44aa158b6d615acf8086278c6 100644
(file)
--- a/
net/sunrpc/rpc_pipe.c
+++ b/
net/sunrpc/rpc_pipe.c
@@
-480,7
+480,7
@@
static int rpc_delete_dentry(struct dentry *dentry)
return 1;
}
return 1;
}
-static struct dentry_operations rpc_dentry_operations = {
+static
const
struct dentry_operations rpc_dentry_operations = {
.d_delete = rpc_delete_dentry,
};
.d_delete = rpc_delete_dentry,
};
@@
-522,8
+522,6
@@
rpc_get_inode(struct super_block *sb, int mode)
if (!inode)
return NULL;
inode->i_mode = mode;
if (!inode)
return NULL;
inode->i_mode = mode;
- inode->i_uid = inode->i_gid = 0;
- inode->i_blocks = 0;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
switch(mode & S_IFMT) {
case S_IFDIR:
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
switch(mode & S_IFMT) {
case S_IFDIR: