projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
[firefly-linux-kernel-4.4.55.git]
/
fs
/
nfs
/
nfs4namespace.c
diff --git
a/fs/nfs/nfs4namespace.c
b/fs/nfs/nfs4namespace.c
index 3d83cb1fdc700ee95f120eee7286ff63f17e17e2..f592672373cbb09c1ba18a0a7aedc1267dbd69b2 100644
(file)
--- a/
fs/nfs/nfs4namespace.c
+++ b/
fs/nfs/nfs4namespace.c
@@
-375,7
+375,7
@@
static struct vfsmount *nfs_do_refmount(struct rpc_clnt *client, struct dentry *
dprintk("%s: getting locations for %pd2\n",
__func__, dentry);
dprintk("%s: getting locations for %pd2\n",
__func__, dentry);
- err = nfs4_proc_fs_locations(client,
parent->d_inode
, &dentry->d_name, fs_locations, page);
+ err = nfs4_proc_fs_locations(client,
d_inode(parent)
, &dentry->d_name, fs_locations, page);
dput(parent);
if (err != 0 ||
fs_locations->nlocations <= 0 ||
dput(parent);
if (err != 0 ||
fs_locations->nlocations <= 0 ||
@@
-396,7
+396,7
@@
struct vfsmount *nfs4_submount(struct nfs_server *server, struct dentry *dentry,
{
rpc_authflavor_t flavor = server->client->cl_auth->au_flavor;
struct dentry *parent = dget_parent(dentry);
{
rpc_authflavor_t flavor = server->client->cl_auth->au_flavor;
struct dentry *parent = dget_parent(dentry);
- struct inode *dir =
parent->d_inode
;
+ struct inode *dir =
d_inode(parent)
;
struct qstr *name = &dentry->d_name;
struct rpc_clnt *client;
struct vfsmount *mnt;
struct qstr *name = &dentry->d_name;
struct rpc_clnt *client;
struct vfsmount *mnt;