cifs: Fix caching to try to do open O_WRONLY as rdwr on server
David Howells
maintainerPATCH 1/1 cifs: Fix caching to try to do open O_WRONLY as rdwr on server
When we're engaged in local caching of a cifs filesystem, we cannot perform caching of a partially written cache granule unless we can read the rest of the granule. This can result in unexpected access errors being reported to the user.
Fix this by the following: if a file is opened O_WRONLY locally, but the mount was given the "-o fsc" flag, try first opening the remote file with GENERIC_READ|GENERIC_WRITE and if that returns -EACCES, try dropping the GENERIC_READ and doing the open again. If that last succeeds, invalidate the cache for that file as for O_DIRECT.
Fixes 70431bfd825d ("cifs: Support fscache indexing rewrite")
Signed-off-by David Howells <[email protected]>
cc Steve French <[email protected]>
cc Shyam Prasad N <[email protected]>
cc Rohith Surabattula <[email protected]>
cc Jeff Layton <[email protected]>
--- fs/smb/client/dir.c | 15 +++++++++++++++ fs/smb/client/file.c | 48 ++++++++++++++++++++++++++++++++++++++---------- fs/smb/client/fscache.h | 6 ++++++ 3 files changed, 59 insertions(+), 10 deletions(-)
fs/smb/client/dir.c +15 -0
@@ -189,6 +189,7 @@ static int cifs_do_create(struct inode *inode, struct dentry *direntry, unsignedint disposition;struct TCP_Server_Info *server = tcon->ses->server;struct cifs_open_parms oparms; +int rdwr_for_fscache =0 ; *oplock =0 ;if (tcon->ses->server->oplocks)
@@ -200,6 +201,10 @@ static int cifs_do_create(struct inode *inode, struct dentry *direntry, unsignedreturn PTR_ERR (full_path); } +/* If we're caching, we need to be able to fill in around partial writes. */ +if (cifs_fscache_enabled (inode) && (oflags &O_ACCMODE ) ==O_WRONLY ) + rdwr_for_fscache =1 ; +#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY if (tcon->unix_ext && cap_unix(tcon->ses) && !tcon->broken_posix_open && (CIFS_UNIX_POSIX_PATH_OPS_CAP &
@@ -276,6 +281,8 @@ static int cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned desired_access |=GENERIC_READ ;/* is this too little? */ if (OPEN_FMODE (oflags) &FMODE_WRITE ) desired_access |=GENERIC_WRITE ; +if (rdwr_for_fscache ==1 ) + desired_access |=GENERIC_READ ; disposition =FILE_OVERWRITE_IF ;if ((oflags & (O_CREAT |O_EXCL )) == (O_CREAT |O_EXCL ))
@@ -304,6 +311,7 @@ static int cifs_do_create(struct inode *inode, struct dentry *direntry, unsignedif (!tcon->unix_ext && (mode &S_IWUGO ) ==0 ) create_options |=CREATE_OPTION_READONLY ; +retry_open: oparms = (struct cifs_open_parms ) { .tcon = tcon, .cifs_sb = cifs_sb,
@@ -317,8 +325,15 @@ static int cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned rc = server->ops->open (xid, &oparms, oplock, buf);if (rc) {cifs_dbg (FYI ,"cifs_create returned 0x%x\n" , rc); +if (rc == -EACCES && rdwr_for_fscache ==1 ) { + desired_access &= ~GENERIC_READ ; + rdwr_for_fscache =2 ; + goto retry_open; + } goto out; } +if (rdwr_for_fscache ==2 ) +cifs_invalidate_cache (inode,FSCACHE_INVAL_DIO_WRITE );#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY /*
fs/smb/client/file.c +38 -10
117 lines not on this page · raw message
fs/smb/client/fscache.h +6 -0
@@ -109,6 +109,11 @@ static inline void cifs_readahead_to_fscache(struct inode *inode,__cifs_readahead_to_fscache (inode, pos, len); } +static inline bool cifs_fscache_enabled (struct inode *inode) +{ +return fscache_cookie_enabled (cifs_inode_cookie (inode)); +} +#else /* CONFIG_CIFS_FSCACHE */ static inline void cifs_fscache_fill_coherency(struct inode *inode,
@@ -124,6 +129,7 @@ static inline void cifs_fscache_release_inode_cookie(struct inode *inode) {}static inline void cifs_fscache_unuse_inode_cookie (struct inode *inode,bool update) {}static inline struct fscache_cookie *cifs_inode_cookie (struct inode *inode) {return NULL ; }static inline void cifs_invalidate_cache (struct inode *inode,unsigned int flags) {} +static inline bool cifs_fscache_enabled (struct inode *inode) {return false; } static inline int cifs_fscache_query_occupancy(struct inode *inode, pgoff_t first, unsigned int nr_pages,