From a59c449be72f920b795385fd8a3b5a1cec0b9f48 Mon Sep 17 00:00:00 2001 From: Alan Tyson Date: Wed, 28 Mar 2007 17:40:35 -0400 Subject: CIFS: reset mode when client notices that ATTR_READONLY is no longer set [CIFS] reset mode when client notices that ATTR_READONLY is no longer set [: removed changelog part of patch] Cc: Chuck Ebbert Signed-off-by: Alan Tyso Signed-off-by: Jeff Layton Signed-off-by: Steve French Signed-off-by: Greg Kroah-Hartman --- fs/cifs/inode.c | 6 ++++++ fs/cifs/readdir.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 79bed901f70..a894e6d8472 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -488,6 +488,12 @@ int cifs_get_inode_info(struct inode **pinode, mode e.g. 555 */ if (cifsInfo->cifsAttrs & ATTR_READONLY) inode->i_mode &= ~(S_IWUGO); + else if ((inode->i_mode & S_IWUGO) == 0) + /* the ATTR_READONLY flag may have been */ + /* changed on server -- set any w bits */ + /* allowed by mnt_file_mode */ + inode->i_mode |= (S_IWUGO & + cifs_sb->mnt_file_mode); /* BB add code here - validate if device or weird share or device type? */ } diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index 99dfb5337e3..d1d79fe3c86 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c @@ -215,6 +215,10 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type, tmp_inode->i_mode |= S_IFREG; if (attr & ATTR_READONLY) tmp_inode->i_mode &= ~(S_IWUGO); + else if ((tmp_inode->i_mode & S_IWUGO) == 0) + /* the ATTR_READONLY flag may have been changed on */ + /* server -- set any w bits allowed by mnt_file_mode */ + tmp_inode->i_mode |= (S_IWUGO & cifs_sb->mnt_file_mode); } /* could add code here - to validate if device or weird share type? */ /* can not fill in nlink here as in qpathinfo version and Unx search */ -- cgit v1.2.3-18-g5258