Commit 3b6492df authored by David Howells's avatar David Howells
Browse files

afs: Increase to 64-bit volume ID and 96-bit vnode ID for YFS 



Increase the sizes of the volume ID to 64 bits and the vnode ID (inode
number equivalent) to 96 bits to allow the support of YFS.

This requires the iget comparator to check the vnode->fid rather than i_ino
and i_generation as i_ino is not sufficiently capacious.  It also requires
this data to be placed into the vnode cache key for fscache.

For the moment, just discard the top 32 bits of the vnode ID when returning
it though stat.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 2a0b4f64

fs/afs/afs.h

+6 −5
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ 
#define AFSPATHMAX		1024	/* Maximum length of a pathname plus NUL */

#define AFSOPAQUEMAX		1024	/* Maximum length of an opaque field */



typedef unsigned			afs_volid_t;

typedef unsigned			afs_vnodeid_t;

typedef unsigned long long		afs_dataversion_t;

typedef u64			afs_volid_t;

typedef u64			afs_vnodeid_t;

typedef u64			afs_dataversion_t;



typedef enum {

	AFSVL_RWVOL,			/* read/write volume */
@@ -52,8 +52,9 @@ typedef enum { 
 */

struct afs_fid {

	afs_volid_t	vid;		/* volume ID */

	afs_vnodeid_t	vnode;		/* file index within volume */

	unsigned	unique;		/* unique ID number (file index version) */

	afs_vnodeid_t	vnode;		/* Lower 64-bits of file index within volume */

	u32		vnode_hi;	/* Upper 32-bits of file index */

	u32		unique;		/* unique ID number (file index version) */

};



/*

fs/afs/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static enum fscache_checkaux afs_vnode_cache_check_aux(void *cookie_netfs_data, 
	struct afs_vnode *vnode = cookie_netfs_data;

	struct afs_vnode_cache_aux aux;



	_enter("{%x,%x,%llx},%p,%u",

	_enter("{%llx,%x,%llx},%p,%u",

	       vnode->fid.vnode, vnode->fid.unique, vnode->status.data_version,

	       buffer, buflen);

fs/afs/callback.c

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ void afs_break_callbacks(struct afs_server *server, size_t count, 
	/* TODO: Sort the callback break list by volume ID */



	for (; count > 0; callbacks++, count--) {

		_debug("- Fid { vl=%08x n=%u u=%u }  CB { v=%u x=%u t=%u }",

		_debug("- Fid { vl=%08llx n=%llu u=%u }  CB { v=%u x=%u t=%u }",

		       callbacks->fid.vid,

		       callbacks->fid.vnode,

		       callbacks->fid.unique,

fs/afs/dir.c

+12 −12
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ static int afs_do_lookup_one(struct inode *dir, struct dentry *dentry, 
	}



	*fid = cookie.fid;

	_leave(" = 0 { vn=%u u=%u }", fid->vnode, fid->unique);

	_leave(" = 0 { vn=%llu u=%u }", fid->vnode, fid->unique);

	return 0;

}
@@ -830,7 +830,7 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry, 
	struct key *key;

	int ret;



	_enter("{%x:%u},%p{%pd},",

	_enter("{%llx:%llu},%p{%pd},",

	       dvnode->fid.vid, dvnode->fid.vnode, dentry, dentry);



	ASSERTCMP(d_inode(dentry), ==, NULL);
@@ -900,7 +900,7 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags) 


	if (d_really_is_positive(dentry)) {

		vnode = AFS_FS_I(d_inode(dentry));

		_enter("{v={%x:%u} n=%pd fl=%lx},",

		_enter("{v={%llx:%llu} n=%pd fl=%lx},",

		       vnode->fid.vid, vnode->fid.vnode, dentry,

		       vnode->flags);

	} else {
@@ -969,7 +969,7 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags) 
		/* if the vnode ID has changed, then the dirent points to a

		 * different file */

		if (fid.vnode != vnode->fid.vnode) {

			_debug("%pd: dirent changed [%u != %u]",

			_debug("%pd: dirent changed [%llu != %llu]",

			       dentry, fid.vnode,

			       vnode->fid.vnode);

			goto not_found;
@@ -1108,7 +1108,7 @@ static int afs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) 


	mode |= S_IFDIR;



	_enter("{%x:%u},{%pd},%ho",

	_enter("{%llx:%llu},{%pd},%ho",

	       dvnode->fid.vid, dvnode->fid.vnode, dentry, mode);



	key = afs_request_key(dvnode->volume->cell);
@@ -1178,7 +1178,7 @@ static int afs_rmdir(struct inode *dir, struct dentry *dentry) 
	u64 data_version = dvnode->status.data_version;

	int ret;



	_enter("{%x:%u},{%pd}",

	_enter("{%llx:%llu},{%pd}",

	       dvnode->fid.vid, dvnode->fid.vnode, dentry);



	key = afs_request_key(dvnode->volume->cell);
@@ -1270,7 +1270,7 @@ static int afs_unlink(struct inode *dir, struct dentry *dentry) 
	u64 data_version = dvnode->status.data_version;

	int ret;



	_enter("{%x:%u},{%pd}",

	_enter("{%llx:%llu},{%pd}",

	       dvnode->fid.vid, dvnode->fid.vnode, dentry);



	if (dentry->d_name.len >= AFSNAMEMAX)
@@ -1334,7 +1334,7 @@ static int afs_create(struct inode *dir, struct dentry *dentry, umode_t mode, 


	mode |= S_IFREG;



	_enter("{%x:%u},{%pd},%ho,",

	_enter("{%llx:%llu},{%pd},%ho,",

	       dvnode->fid.vid, dvnode->fid.vnode, dentry, mode);



	ret = -ENAMETOOLONG;
@@ -1397,7 +1397,7 @@ static int afs_link(struct dentry *from, struct inode *dir, 
	dvnode = AFS_FS_I(dir);

	data_version = dvnode->status.data_version;



	_enter("{%x:%u},{%x:%u},{%pd}",

	_enter("{%llx:%llu},{%llx:%llu},{%pd}",

	       vnode->fid.vid, vnode->fid.vnode,

	       dvnode->fid.vid, dvnode->fid.vnode,

	       dentry);
@@ -1468,7 +1468,7 @@ static int afs_symlink(struct inode *dir, struct dentry *dentry, 
	u64 data_version = dvnode->status.data_version;

	int ret;



	_enter("{%x:%u},{%pd},%s",

	_enter("{%llx:%llu},{%pd},%s",

	       dvnode->fid.vid, dvnode->fid.vnode, dentry,

	       content);
@@ -1544,7 +1544,7 @@ static int afs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	orig_data_version = orig_dvnode->status.data_version;

	new_data_version = new_dvnode->status.data_version;



	_enter("{%x:%u},{%x:%u},{%x:%u},{%pd}",

	_enter("{%llx:%llu},{%llx:%llu},{%llx:%llu},{%pd}",

	       orig_dvnode->fid.vid, orig_dvnode->fid.vnode,

	       vnode->fid.vid, vnode->fid.vnode,

	       new_dvnode->fid.vid, new_dvnode->fid.vnode,
@@ -1611,7 +1611,7 @@ static int afs_dir_releasepage(struct page *page, gfp_t gfp_flags) 
{

	struct afs_vnode *dvnode = AFS_FS_I(page->mapping->host);



	_enter("{{%x:%u}[%lu]}", dvnode->fid.vid, dvnode->fid.vnode, page->index);

	_enter("{{%llx:%llu}[%lu]}", dvnode->fid.vid, dvnode->fid.vnode, page->index);



	set_page_private(page, 0);

	ClearPagePrivate(page);

fs/afs/dynroot.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ struct inode *afs_try_auto_mntpt(struct dentry *dentry, struct inode *dir) 
	struct inode *inode;

	int ret = -ENOENT;



	_enter("%p{%pd}, {%x:%u}",

	_enter("%p{%pd}, {%llx:%llu}",

	       dentry, dentry, vnode->fid.vid, vnode->fid.vnode);



	if (!test_bit(AFS_VNODE_AUTOCELL, &vnode->flags))

CRA Git | Maintained and supported by SUSTech CRA and CCSE