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

Commit abab095d authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: add cifs_revalidate_file 



...to allow updating inode attributes on an existing inode by
filehandle. Change mmap and llseek codepaths to use that
instead of cifs_revalidate_dentry since they have a filehandle
readily available.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent c8634fd3

fs/cifs/cifsfs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -639,7 +639,7 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int origin) 
		   setting the revalidate time to zero */

		   setting the revalidate time to zero */

		CIFS_I(file->f_path.dentry->d_inode)->time = 0;

		CIFS_I(file->f_path.dentry->d_inode)->time = 0;





		retval = cifs_revalidate_dentry(file->f_path.dentry);

		retval = cifs_revalidate_file(file);

		if (retval < 0)

		if (retval < 0)

			return (loff_t)retval;

			return (loff_t)retval;

	}

	}

fs/cifs/cifsfs.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,7 @@ extern int cifs_mkdir(struct inode *, struct dentry *, int); 
extern int cifs_rmdir(struct inode *, struct dentry *);

extern int cifs_rmdir(struct inode *, struct dentry *);

extern int cifs_rename(struct inode *, struct dentry *, struct inode *,

extern int cifs_rename(struct inode *, struct dentry *, struct inode *,

		       struct dentry *);

		       struct dentry *);

extern int cifs_revalidate_file(struct file *filp);

extern int cifs_revalidate_dentry(struct dentry *);

extern int cifs_revalidate_dentry(struct dentry *);

extern int cifs_getattr(struct vfsmount *, struct dentry *, struct kstat *);

extern int cifs_getattr(struct vfsmount *, struct dentry *, struct kstat *);

extern int cifs_setattr(struct dentry *, struct iattr *);

extern int cifs_setattr(struct dentry *, struct iattr *);

fs/cifs/cifsproto.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -104,10 +104,12 @@ extern void cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr); 
extern struct inode *cifs_iget(struct super_block *sb,

extern struct inode *cifs_iget(struct super_block *sb,

			       struct cifs_fattr *fattr);

			       struct cifs_fattr *fattr);





extern int cifs_get_file_info(struct file *filp);

extern int cifs_get_inode_info(struct inode **pinode,

extern int cifs_get_inode_info(struct inode **pinode,

			const unsigned char *search_path,

			const unsigned char *search_path,

			FILE_ALL_INFO *pfile_info,

			FILE_ALL_INFO *pfile_info,

			struct super_block *sb, int xid, const __u16 *pfid);

			struct super_block *sb, int xid, const __u16 *pfid);

extern int cifs_get_file_info_unix(struct file *filp);

extern int cifs_get_inode_info_unix(struct inode **pinode,

extern int cifs_get_inode_info_unix(struct inode **pinode,

			const unsigned char *search_path,

			const unsigned char *search_path,

			struct super_block *sb, int xid);

			struct super_block *sb, int xid);

fs/cifs/file.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1890,11 +1890,10 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size, 




int cifs_file_mmap(struct file *file, struct vm_area_struct *vma)

int cifs_file_mmap(struct file *file, struct vm_area_struct *vma)

{

{

	struct dentry *dentry = file->f_path.dentry;

	int rc, xid;

	int rc, xid;





	xid = GetXid();

	xid = GetXid();

	rc = cifs_revalidate_dentry(dentry);

	rc = cifs_revalidate_file(file);

	if (rc) {

	if (rc) {

		cFYI(1, ("Validation prior to mmap failed, error=%d", rc));

		cFYI(1, ("Validation prior to mmap failed, error=%d", rc));

		FreeXid(xid);

		FreeXid(xid);

fs/cifs/inode.c

+86 −0
Original line number Original line Diff line number Diff line
@@ -268,6 +268,31 @@ cifs_create_dfs_fattr(struct cifs_fattr *fattr, struct super_block *sb) 
	fattr->cf_flags |= CIFS_FATTR_DFS_REFERRAL;

	fattr->cf_flags |= CIFS_FATTR_DFS_REFERRAL;

}

}





int cifs_get_file_info_unix(struct file *filp)

{

	int rc;

	int xid;

	FILE_UNIX_BASIC_INFO find_data;

	struct cifs_fattr fattr;

	struct inode *inode = filp->f_path.dentry->d_inode;

	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);

	struct cifsTconInfo *tcon = cifs_sb->tcon;

	struct cifsFileInfo *cfile = (struct cifsFileInfo *) filp->private_data;



	xid = GetXid();

	rc = CIFSSMBUnixQFileInfo(xid, tcon, cfile->netfid, &find_data);

	if (!rc) {

		cifs_unix_basic_to_fattr(&fattr, &find_data, cifs_sb);

	} else if (rc == -EREMOTE) {

		cifs_create_dfs_fattr(&fattr, inode->i_sb);

		rc = 0;

	}



	cifs_fattr_to_inode(inode, &fattr);

	FreeXid(xid);

	return rc;

}



int cifs_get_inode_info_unix(struct inode **pinode,

int cifs_get_inode_info_unix(struct inode **pinode,

			     const unsigned char *full_path,

			     const unsigned char *full_path,

			     struct super_block *sb, int xid)

			     struct super_block *sb, int xid)
@@ -469,6 +494,47 @@ cifs_all_info_to_fattr(struct cifs_fattr *fattr, FILE_ALL_INFO *info, 
	fattr->cf_gid = cifs_sb->mnt_gid;

	fattr->cf_gid = cifs_sb->mnt_gid;

}

}





int cifs_get_file_info(struct file *filp)

{

	int rc;

	int xid;

	FILE_ALL_INFO find_data;

	struct cifs_fattr fattr;

	struct inode *inode = filp->f_path.dentry->d_inode;

	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);

	struct cifsTconInfo *tcon = cifs_sb->tcon;

	struct cifsFileInfo *cfile = (struct cifsFileInfo *) filp->private_data;



	xid = GetXid();

	rc = CIFSSMBQFileInfo(xid, tcon, cfile->netfid, &find_data);

	if (rc == -EOPNOTSUPP || rc == -EINVAL) {

		/*

		 * FIXME: legacy server -- fall back to path-based call?

 		 * for now, just skip revalidating and mark inode for

 		 * immediate reval.

 		 */

		rc = 0;

		CIFS_I(inode)->time = 0;

		goto cgfi_exit;

	} else if (rc == -EREMOTE) {

		cifs_create_dfs_fattr(&fattr, inode->i_sb);

		rc = 0;

	} else if (rc)

		goto cgfi_exit;



	/*

	 * don't bother with SFU junk here -- just mark inode as needing

	 * revalidation.

	 */

	cifs_all_info_to_fattr(&fattr, &find_data, cifs_sb, false);

	fattr.cf_uniqueid = CIFS_I(inode)->uniqueid;

	fattr.cf_flags |= CIFS_FATTR_NEED_REVAL;

	cifs_fattr_to_inode(inode, &fattr);

cgfi_exit:

	FreeXid(xid);

	return rc;

}



int cifs_get_inode_info(struct inode **pinode,

int cifs_get_inode_info(struct inode **pinode,

	const unsigned char *full_path, FILE_ALL_INFO *pfindData,

	const unsigned char *full_path, FILE_ALL_INFO *pfindData,

	struct super_block *sb, int xid, const __u16 *pfid)

	struct super_block *sb, int xid, const __u16 *pfid)
@@ -1465,6 +1531,26 @@ cifs_invalidate_mapping(struct inode *inode) 
	invalidate_remote_inode(inode);

	invalidate_remote_inode(inode);

}

}





int cifs_revalidate_file(struct file *filp)

{

	int rc = 0;

	struct inode *inode = filp->f_path.dentry->d_inode;



	if (!cifs_inode_needs_reval(inode))

		goto check_inval;



	if (CIFS_SB(inode->i_sb)->tcon->unix_ext)

		rc = cifs_get_file_info_unix(filp);

	else

		rc = cifs_get_file_info(filp);



check_inval:

	if (CIFS_I(inode)->invalid_mapping)

		cifs_invalidate_mapping(inode);



	return rc;

}



/* revalidate a dentry's inode attributes */

/* revalidate a dentry's inode attributes */

int cifs_revalidate_dentry(struct dentry *dentry)

int cifs_revalidate_dentry(struct dentry *dentry)

{

{