Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
8b244ff2
Commit
8b244ff2
authored
Dec 18, 2010
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
switch nfs to ->s_d_op
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
96e13914
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
10 deletions
+1
-10
fs/nfs/dir.c
fs/nfs/dir.c
+0
-4
fs/nfs/getroot.c
fs/nfs/getroot.c
+0
-6
fs/nfs/super.c
fs/nfs/super.c
+1
-0
No files found.
fs/nfs/dir.c
View file @
8b244ff2
...
@@ -439,7 +439,6 @@ void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry)
...
@@ -439,7 +439,6 @@ void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry)
if
(
dentry
==
NULL
)
if
(
dentry
==
NULL
)
return
;
return
;
d_set_d_op
(
dentry
,
NFS_PROTO
(
dir
)
->
dentry_ops
);
inode
=
nfs_fhget
(
dentry
->
d_sb
,
entry
->
fh
,
entry
->
fattr
);
inode
=
nfs_fhget
(
dentry
->
d_sb
,
entry
->
fh
,
entry
->
fattr
);
if
(
IS_ERR
(
inode
))
if
(
IS_ERR
(
inode
))
goto
out
;
goto
out
;
...
@@ -1193,8 +1192,6 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru
...
@@ -1193,8 +1192,6 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru
if
(
dentry
->
d_name
.
len
>
NFS_SERVER
(
dir
)
->
namelen
)
if
(
dentry
->
d_name
.
len
>
NFS_SERVER
(
dir
)
->
namelen
)
goto
out
;
goto
out
;
d_set_d_op
(
dentry
,
NFS_PROTO
(
dir
)
->
dentry_ops
);
/*
/*
* If we're doing an exclusive create, optimize away the lookup
* If we're doing an exclusive create, optimize away the lookup
* but don't hash the dentry.
* but don't hash the dentry.
...
@@ -1338,7 +1335,6 @@ static struct dentry *nfs_atomic_lookup(struct inode *dir, struct dentry *dentry
...
@@ -1338,7 +1335,6 @@ static struct dentry *nfs_atomic_lookup(struct inode *dir, struct dentry *dentry
res
=
ERR_PTR
(
-
ENAMETOOLONG
);
res
=
ERR_PTR
(
-
ENAMETOOLONG
);
goto
out
;
goto
out
;
}
}
d_set_d_op
(
dentry
,
NFS_PROTO
(
dir
)
->
dentry_ops
);
/* Let vfs_create() deal with O_EXCL. Instantiate, but don't hash
/* Let vfs_create() deal with O_EXCL. Instantiate, but don't hash
* the dentry. */
* the dentry. */
...
...
fs/nfs/getroot.c
View file @
8b244ff2
...
@@ -119,9 +119,6 @@ struct dentry *nfs_get_root(struct super_block *sb, struct nfs_fh *mntfh)
...
@@ -119,9 +119,6 @@ struct dentry *nfs_get_root(struct super_block *sb, struct nfs_fh *mntfh)
}
}
security_d_instantiate
(
ret
,
inode
);
security_d_instantiate
(
ret
,
inode
);
if
(
ret
->
d_op
==
NULL
)
d_set_d_op
(
ret
,
server
->
nfs_client
->
rpc_ops
->
dentry_ops
);
out:
out:
nfs_free_fattr
(
fsinfo
.
fattr
);
nfs_free_fattr
(
fsinfo
.
fattr
);
return
ret
;
return
ret
;
...
@@ -227,9 +224,6 @@ struct dentry *nfs4_get_root(struct super_block *sb, struct nfs_fh *mntfh)
...
@@ -227,9 +224,6 @@ struct dentry *nfs4_get_root(struct super_block *sb, struct nfs_fh *mntfh)
security_d_instantiate
(
ret
,
inode
);
security_d_instantiate
(
ret
,
inode
);
if
(
ret
->
d_op
==
NULL
)
d_set_d_op
(
ret
,
server
->
nfs_client
->
rpc_ops
->
dentry_ops
);
out:
out:
nfs_free_fattr
(
fattr
);
nfs_free_fattr
(
fattr
);
dprintk
(
"<-- nfs4_get_root()
\n
"
);
dprintk
(
"<-- nfs4_get_root()
\n
"
);
...
...
fs/nfs/super.c
View file @
8b244ff2
...
@@ -2202,6 +2202,7 @@ static int nfs_set_super(struct super_block *s, void *data)
...
@@ -2202,6 +2202,7 @@ static int nfs_set_super(struct super_block *s, void *data)
s
->
s_flags
=
sb_mntdata
->
mntflags
;
s
->
s_flags
=
sb_mntdata
->
mntflags
;
s
->
s_fs_info
=
server
;
s
->
s_fs_info
=
server
;
s
->
s_d_op
=
server
->
nfs_client
->
rpc_ops
->
dentry_ops
;
ret
=
set_anon_super
(
s
,
server
);
ret
=
set_anon_super
(
s
,
server
);
if
(
ret
==
0
)
if
(
ret
==
0
)
server
->
s_dev
=
s
->
s_dev
;
server
->
s_dev
=
s
->
s_dev
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment