diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
| commit | 8624512aa908741ba2795200133eae0d7f4557ea (patch) | |
| tree | d5d3036fccf2604f4c98dedc11e8adb929d6b52e /fs/nfsd | |
| parent | 7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff) | |
Merge with 2.3.48.
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfsfh.c | 2 | ||||
| -rw-r--r-- | fs/nfsd/vfs.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index 63c8fec93..aa03c0a16 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c @@ -76,7 +76,7 @@ static int get_ino_name(struct dentry *dentry, struct qstr *name, unsigned long if (!dir || !S_ISDIR(dir->i_mode)) goto out; error = -EINVAL; - if (!dir->i_op || !dir->i_op->default_file_ops) + if (!dir->i_fop) goto out; /* * Open the directory ... diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 5ea680286..c0f7da6cc 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -432,14 +432,14 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, err = nfserr_perm; if (IS_APPEND(inode) || IS_ISMNDLK(inode)) goto out; - if (!inode->i_op || !inode->i_op->default_file_ops) + if (!inode->i_fop) goto out; if ((access & MAY_WRITE) && (err = get_write_access(inode)) != 0) goto out_nfserr; memset(filp, 0, sizeof(*filp)); - filp->f_op = inode->i_op->default_file_ops; + filp->f_op = inode->i_fop; atomic_set(&filp->f_count, 1); filp->f_dentry = dentry; if (access & MAY_WRITE) { @@ -512,8 +512,7 @@ nfsd_sync_dir(struct dentry *dp) struct inode *inode = dp->d_inode; int (*fsync) (struct file *, struct dentry *); - if (inode->i_op->default_file_ops - && (fsync = inode->i_op->default_file_ops->fsync)) { + if (inode->i_fop && (fsync = inode->i_fop->fsync)) { fsync(NULL, dp); } } |