diff options
| author | Ronnie Sahlberg <lsahlber@redhat.com> | 2020-12-12 13:40:50 -0600 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2020-12-14 09:16:23 -0600 |
| commit | 8401e93678933a140cebfa2e7122c1a6b687c355 (patch) | |
| tree | 1acc691e51c7815dc9b14a0d995e2372c55ef955 /fs/cifs/file.c | |
| parent | ee0dce4926b95c3c96217c076550216eb6dcd90b (diff) | |
| download | linux-rpi-8401e93678933a140cebfa2e7122c1a6b687c355.tar.gz linux-rpi-8401e93678933a140cebfa2e7122c1a6b687c355.tar.bz2 linux-rpi-8401e93678933a140cebfa2e7122c1a6b687c355.zip | |
cifs: remove [gu]id/backup[gu]id/file_mode/dir_mode from cifs_sb
We can already access these from cifs_sb->ctx so we no longer need
a local copy in cifs_sb.
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs/file.c')
| -rw-r--r-- | fs/cifs/file.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 29176a56229f..583074546e6f 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -44,6 +44,7 @@ #include "cifs_fs_sb.h" #include "fscache.h" #include "smbdirect.h" +#include "fs_context.h" static inline int cifs_convert_flags(unsigned int flags) { @@ -571,7 +572,7 @@ int cifs_open(struct inode *inode, struct file *file) le64_to_cpu(tcon->fsUnixInfo.Capability))) { /* can not refresh inode info since size could be stale */ rc = cifs_posix_open(full_path, &inode, inode->i_sb, - cifs_sb->mnt_file_mode /* ignored */, + cifs_sb->ctx->file_mode /* ignored */, file->f_flags, &oplock, &fid.netfid, xid); if (rc == 0) { cifs_dbg(FYI, "posix open succeeded\n"); @@ -740,7 +741,7 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush) ~(O_CREAT | O_EXCL | O_TRUNC); rc = cifs_posix_open(full_path, NULL, inode->i_sb, - cifs_sb->mnt_file_mode /* ignored */, + cifs_sb->ctx->file_mode /* ignored */, oflags, &oplock, &cfile->fid.netfid, xid); if (rc == 0) { cifs_dbg(FYI, "posix reopen succeeded\n"); |