Commit c520ba75 authored by Paulo Alcantara's avatar Paulo Alcantara Committed by Steve French
Browse files

smb: client: move most of reparse point handling code to common file 



In preparation to add support for creating special files also via WSL
reparse points in next commits.

Signed-off-by: default avatarPaulo Alcantara <pc@manguebit.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent eb90e8ec

fs/smb/client/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ cifs-y := trace.o cifsfs.o cifs_debug.o connect.o dir.o file.o \ 
	  smb2ops.o smb2maperror.o smb2transport.o \

	  smb2misc.o smb2pdu.o smb2inode.o smb2file.o cifsacl.o fs_context.o \

	  dns_resolve.o cifs_spnego_negtokeninit.asn1.o asn1.o \

	  namespace.o

	  namespace.o reparse.o



$(obj)/asn1.o: $(obj)/cifs_spnego_negtokeninit.asn1.h

fs/smb/client/cifsglob.h

+0 −13
Original line number Diff line number Diff line
@@ -223,19 +223,6 @@ struct cifs_open_info_data { 
	};

};



static inline bool cifs_open_data_reparse(struct cifs_open_info_data *data)

{

	struct smb2_file_all_info *fi = &data->fi;

	u32 attrs = le32_to_cpu(fi->Attributes);

	bool ret;



	ret = data->reparse_point || (attrs & ATTR_REPARSE);

	if (ret)

		attrs |= ATTR_REPARSE;

	fi->Attributes = cpu_to_le32(attrs);

	return ret;

}



/*

 *****************************************************************

 * Except the CIFS PDUs themselves all the

fs/smb/client/cifsproto.h

+0 −4
Original line number Diff line number Diff line
@@ -210,10 +210,6 @@ extern struct inode *cifs_iget(struct super_block *sb, 
int cifs_get_inode_info(struct inode **inode, const char *full_path,

			struct cifs_open_info_data *data, struct super_block *sb, int xid,

			const struct cifs_fid *fid);

bool cifs_reparse_point_to_fattr(struct cifs_sb_info *cifs_sb,

				 struct cifs_fattr *fattr,

				 struct cifs_open_info_data *data);



extern int smb311_posix_get_inode_info(struct inode **inode,

				       const char *full_path,

				       struct cifs_open_info_data *data,

fs/smb/client/inode.c

+1 −78
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "fs_context.h"

#include "cifs_ioctl.h"

#include "cached_dir.h"

#include "reparse.h"



static void cifs_set_ops(struct inode *inode)

{
@@ -728,84 +729,6 @@ static void smb311_posix_info_to_fattr(struct cifs_fattr *fattr, 
		fattr->cf_mode, fattr->cf_uniqueid, fattr->cf_nlink);

}



static inline dev_t nfs_mkdev(struct reparse_posix_data *buf)

{

	u64 v = le64_to_cpu(*(__le64 *)buf->DataBuffer);



	return MKDEV(v >> 32, v & 0xffffffff);

}



bool cifs_reparse_point_to_fattr(struct cifs_sb_info *cifs_sb,

				 struct cifs_fattr *fattr,

				 struct cifs_open_info_data *data)

{

	struct reparse_posix_data *buf = data->reparse.posix;

	u32 tag = data->reparse.tag;



	if (tag == IO_REPARSE_TAG_NFS && buf) {

		switch (le64_to_cpu(buf->InodeType)) {

		case NFS_SPECFILE_CHR:

			fattr->cf_mode |= S_IFCHR;

			fattr->cf_dtype = DT_CHR;

			fattr->cf_rdev = nfs_mkdev(buf);

			break;

		case NFS_SPECFILE_BLK:

			fattr->cf_mode |= S_IFBLK;

			fattr->cf_dtype = DT_BLK;

			fattr->cf_rdev = nfs_mkdev(buf);

			break;

		case NFS_SPECFILE_FIFO:

			fattr->cf_mode |= S_IFIFO;

			fattr->cf_dtype = DT_FIFO;

			break;

		case NFS_SPECFILE_SOCK:

			fattr->cf_mode |= S_IFSOCK;

			fattr->cf_dtype = DT_SOCK;

			break;

		case NFS_SPECFILE_LNK:

			fattr->cf_mode |= S_IFLNK;

			fattr->cf_dtype = DT_LNK;

			break;

		default:

			WARN_ON_ONCE(1);

			return false;

		}

		return true;

	}



	switch (tag) {

	case IO_REPARSE_TAG_LX_SYMLINK:

		fattr->cf_mode |= S_IFLNK;

		fattr->cf_dtype = DT_LNK;

		break;

	case IO_REPARSE_TAG_LX_FIFO:

		fattr->cf_mode |= S_IFIFO;

		fattr->cf_dtype = DT_FIFO;

		break;

	case IO_REPARSE_TAG_AF_UNIX:

		fattr->cf_mode |= S_IFSOCK;

		fattr->cf_dtype = DT_SOCK;

		break;

	case IO_REPARSE_TAG_LX_CHR:

		fattr->cf_mode |= S_IFCHR;

		fattr->cf_dtype = DT_CHR;

		break;

	case IO_REPARSE_TAG_LX_BLK:

		fattr->cf_mode |= S_IFBLK;

		fattr->cf_dtype = DT_BLK;

		break;

	case 0: /* SMB1 symlink */

	case IO_REPARSE_TAG_SYMLINK:

	case IO_REPARSE_TAG_NFS:

		fattr->cf_mode |= S_IFLNK;

		fattr->cf_dtype = DT_LNK;

		break;

	default:

		return false;

	}

	return true;

}



static void cifs_open_info_to_fattr(struct cifs_fattr *fattr,

				    struct cifs_open_info_data *data,

				    struct super_block *sb)

fs/smb/client/readdir.c

+1 −17
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "smb2proto.h"

#include "fs_context.h"

#include "cached_dir.h"

#include "reparse.h"



/*

 * To be safe - for UCS to UTF-8 with strings loaded with the rare long
@@ -55,23 +56,6 @@ static inline void dump_cifs_file_struct(struct file *file, char *label) 
}

#endif /* DEBUG2 */



/*

 * Match a reparse point inode if reparse tag and ctime haven't changed.

 *

 * Windows Server updates ctime of reparse points when their data have changed.

 * The server doesn't allow changing reparse tags from existing reparse points,

 * though it's worth checking.

 */

static inline bool reparse_inode_match(struct inode *inode,

				       struct cifs_fattr *fattr)

{

	struct timespec64 ctime = inode_get_ctime(inode);



	return (CIFS_I(inode)->cifsAttrs & ATTR_REPARSE) &&

		CIFS_I(inode)->reparse_tag == fattr->cf_cifstag &&

		timespec64_equal(&ctime, &fattr->cf_ctime);

}



/*

 * Attempt to preload the dcache with the results from the FIND_FIRST/NEXT

 *