diff options
Diffstat (limited to 'fs/nfsd/vfs.c')
-rw-r--r-- | fs/nfsd/vfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index d586117fa94a..a94245b4045f 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
@@ -979,7 +979,7 @@ static void kill_suid(struct dentry *dentry) | |||
979 | */ | 979 | */ |
980 | static int wait_for_concurrent_writes(struct file *file) | 980 | static int wait_for_concurrent_writes(struct file *file) |
981 | { | 981 | { |
982 | struct inode *inode = file->f_path.dentry->d_inode; | 982 | struct inode *inode = file_inode(file); |
983 | static ino_t last_ino; | 983 | static ino_t last_ino; |
984 | static dev_t last_dev; | 984 | static dev_t last_dev; |
985 | int err = 0; | 985 | int err = 0; |
@@ -1070,7 +1070,7 @@ __be32 nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
1070 | if (err) | 1070 | if (err) |
1071 | return err; | 1071 | return err; |
1072 | 1072 | ||
1073 | inode = file->f_path.dentry->d_inode; | 1073 | inode = file_inode(file); |
1074 | 1074 | ||
1075 | /* Get readahead parameters */ | 1075 | /* Get readahead parameters */ |
1076 | ra = nfsd_get_raparms(inode->i_sb->s_dev, inode->i_ino); | 1076 | ra = nfsd_get_raparms(inode->i_sb->s_dev, inode->i_ino); |
@@ -1957,7 +1957,7 @@ static __be32 nfsd_buffered_readdir(struct file *file, filldir_t func, | |||
1957 | offset = *offsetp; | 1957 | offset = *offsetp; |
1958 | 1958 | ||
1959 | while (1) { | 1959 | while (1) { |
1960 | struct inode *dir_inode = file->f_path.dentry->d_inode; | 1960 | struct inode *dir_inode = file_inode(file); |
1961 | unsigned int reclen; | 1961 | unsigned int reclen; |
1962 | 1962 | ||
1963 | cdp->err = nfserr_eof; /* will be cleared on successful read */ | 1963 | cdp->err = nfserr_eof; /* will be cleared on successful read */ |