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

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

cifs: eliminate pfile pointer from cifsFileInfo 



All the remaining users of cifsFileInfo->pfile just use it to get
at the f_flags/f_mode. Now that we store that separately in the
cifsFileInfo, there's no need to consult the pfile at all from
a cifsFileInfo pointer.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Reviewed-by: default avatarSuresh Jayaraman <sjayaraman@suse.de>
Acked-by: default avatarDave Kleikamp <shaggy@linux.vnet.ibm.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 7da4b49a

fs/cifs/cifsglob.h

+0 −1
Original line number Diff line number Diff line
@@ -388,7 +388,6 @@ struct cifsFileInfo { 
	__u16 netfid;		/* file id from remote */

	/* BB add lock scope info here if needed */ ;

	/* lock scope id (0 if none) */

	struct file *pfile; /* needed for writepage */

	struct dentry *dentry;

	unsigned int f_flags;

	struct tcon_link *tlink;

fs/cifs/dir.c

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ cifs_new_fileinfo(__u16 fileHandle, struct file *file, 
	pCifsFile->uid = current_fsuid();

	pCifsFile->dentry = dget(dentry);

	pCifsFile->f_flags = file->f_flags;

	pCifsFile->pfile = file;

	pCifsFile->invalidHandle = false;

	pCifsFile->closePend = false;

	pCifsFile->tlink = cifs_get_tlink(tlink);

fs/cifs/file.c

+3 −8
Original line number Diff line number Diff line
@@ -1144,8 +1144,7 @@ struct cifsFileInfo *find_readable_file(struct cifsInodeInfo *cifs_inode, 
			continue;

		if (fsuid_only && open_file->uid != current_fsuid())

			continue;

		if (open_file->pfile && ((open_file->pfile->f_flags & O_RDWR) ||

		    (open_file->pfile->f_flags & O_RDONLY))) {

		if (OPEN_FMODE(open_file->f_flags) & FMODE_READ) {

			if (!open_file->invalidHandle) {

				/* found a good file */

				/* lock it so it will not be closed on us */
@@ -1194,9 +1193,7 @@ refind_writable: 
			continue;

		if (fsuid_only && open_file->uid != current_fsuid())

			continue;

		if (open_file->pfile &&

		    ((open_file->pfile->f_flags & O_RDWR) ||

		     (open_file->pfile->f_flags & O_WRONLY))) {

		if (OPEN_FMODE(open_file->f_flags) & FMODE_WRITE) {

			cifsFileInfo_get(open_file);



			if (!open_file->invalidHandle) {
@@ -2160,9 +2157,7 @@ static int is_inode_writable(struct cifsInodeInfo *cifs_inode) 
	list_for_each_entry(open_file, &cifs_inode->openFileList, flist) {

		if (open_file->closePend)

			continue;

		if (open_file->pfile &&

		    ((open_file->pfile->f_flags & O_RDWR) ||

		     (open_file->pfile->f_flags & O_WRONLY))) {

		if (OPEN_FMODE(open_file->f_flags) & FMODE_WRITE) {

			read_unlock(&GlobalSMBSeslock);

			return 1;

		}