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

Commit a00be0e3 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

cifs: don't use ->d_time 



Use d_fsdata instead, which is the same size.  Introduce helpers to hide
the typecasts.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Cc: Steve French <sfrench@samba.org>
parent beaf226b

fs/cifs/cifsfs.h

+10 −0
Original line number Diff line number Diff line
@@ -41,6 +41,16 @@ cifs_uniqueid_to_ino_t(u64 fileid) 


}



static inline void cifs_set_time(struct dentry *dentry, unsigned long time)

{

	dentry->d_fsdata = (void *) time;

}



static inline unsigned long cifs_get_time(struct dentry *dentry)

{

	return (unsigned long) dentry->d_fsdata;

}



extern struct file_system_type cifs_fs_type;

extern const struct address_space_operations cifs_addr_ops;

extern const struct address_space_operations cifs_addr_ops_smallbuf;

fs/cifs/dir.c

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ renew_parental_timestamps(struct dentry *direntry) 
	/* BB check if there is a way to get the kernel to do this or if we

	   really need this */

	do {

		direntry->d_time = jiffies;

		cifs_set_time(direntry, jiffies);

		direntry = direntry->d_parent;

	} while (!IS_ROOT(direntry));

}
@@ -802,7 +802,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, 


	} else if (rc == -ENOENT) {

		rc = 0;

		direntry->d_time = jiffies;

		cifs_set_time(direntry, jiffies);

		d_add(direntry, NULL);

	/*	if it was once a directory (but how can we tell?) we could do

		shrink_dcache_parent(direntry); */
@@ -862,7 +862,7 @@ cifs_d_revalidate(struct dentry *direntry, unsigned int flags) 
	if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET))

		return 0;



	if (time_after(jiffies, direntry->d_time + HZ) || !lookupCacheEnabled)

	if (time_after(jiffies, cifs_get_time(direntry) + HZ) || !lookupCacheEnabled)

		return 0;



	return 1;

fs/cifs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1951,7 +1951,7 @@ int cifs_revalidate_dentry_attr(struct dentry *dentry) 


	cifs_dbg(FYI, "Update attributes: %s inode 0x%p count %d dentry: 0x%p d_time %ld jiffies %ld\n",

		 full_path, inode, inode->i_count.counter,

		 dentry, dentry->d_time, jiffies);

		 dentry, cifs_get_time(dentry), jiffies);



	if (cifs_sb_master_tcon(CIFS_SB(sb))->unix_ext)

		rc = cifs_get_inode_info_unix(&inode, full_path, sb, xid);