Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5c1e2ea authored Mar 10, 2007 by Alan Tyson Committed by Steve French Mar 10, 2007

[CIFS] reset mode when client notices that ATTR_READONLY is no longer set



Signed-off-by: Alan Tyso <atyson@hp.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>

parent eee8abe5

fs/cifs/CHANGES

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4,6 +4,9 @@ Fix mtime bouncing around from local idea of last write times to remote time.
	Fix hang (in i_size_read) when simultaneous size update of same remote file		Fix hang (in i_size_read) when simultaneous size update of same remote file
	on smp system corrupts sequence number. Do not reread unnecessarily partial page		on smp system corrupts sequence number. Do not reread unnecessarily partial page
	(which we are about to overwrite anyway) when writing out file opened rw.		(which we are about to overwrite anyway) when writing out file opened rw.
			When DOS attribute of file on non-Unix server's file changes on the server side
			from read-only back to read-write, reflect this change in default file mode
			(we had been leaving a file's mode read-only until the inode were reloaded)

	Version 1.47		Version 1.47
	------------		------------

fs/cifs/inode.c

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -494,6 +494,12 @@ int cifs_get_inode_info(struct inode **pinode,
	mode e.g. 555 */		mode e.g. 555 */
	if (cifsInfo->cifsAttrs & ATTR_READONLY)		if (cifsInfo->cifsAttrs & ATTR_READONLY)
	inode->i_mode &= ~(S_IWUGO);		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 -		/* BB add code here -
	validate if device or weird share or device type? */		validate if device or weird share or device type? */
	}		}

fs/cifs/readdir.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -219,6 +219,10 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
	tmp_inode->i_mode \|= S_IFREG;		tmp_inode->i_mode \|= S_IFREG;
	if (attr & ATTR_READONLY)		if (attr & ATTR_READONLY)
	tmp_inode->i_mode &= ~(S_IWUGO);		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? */		} /* 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 */		/* can not fill in nlink here as in qpathinfo version and Unx search */