The patch titled
knfsd-add-nfs-export-support-to-tmpfs fioxes
has been removed from the -mm tree. Its filename is
knfsd-add-nfs-export-support-to-tmpfs-fixes.patch
This patch was dropped because it was folded into knfsd-add-nfs-export-support-to-tmpfs.patch
------------------------------------------------------
Subject: knfsd-add-nfs-export-support-to-tmpfs fioxes
From: Neil Brown <neilb@xxxxxxx>
Fix issues with nfs exporting of tmpfs
Two particular problem:
i_ino can be 64bit, so use 64 bits in filehandle to store it.
i_ino can be reused, so use ilookup5 and i_generation to avoid any
possible confusion.
Cc: Hugh Dickins <hugh@xxxxxxxxxxx>
Cc: "David M. Grimes" <dgrimes@xxxxxxxxxxxx>
Signed-off-by: Neil Brown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
mm/shmem.c | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff -puN mm/shmem.c~knfsd-add-nfs-export-support-to-tmpfs-fixes mm/shmem.c
--- a/mm/shmem.c~knfsd-add-nfs-export-support-to-tmpfs-fixes
+++ a/mm/shmem.c
@@ -1962,16 +1962,25 @@ static struct dentry *shmem_get_parent(s
return ERR_PTR(-ESTALE);
}
+static int shmem_match(struct inode *ino, void *vfh)
+{
+ __u32 *fh = vfh;
+ __u64 inum = fh[2];
+ inum = (inum << 32) | fh[1];
+ return ino->i_ino == inum && fh[0] == ino->i_generation;
+}
+
static struct dentry *shmem_get_dentry(struct super_block *sb, void *vfh)
{
struct dentry *de = NULL;
struct inode *inode;
__u32 *fh = vfh;
+ __u64 inum = fh[2];
+ inum = (inum << 32) | fh[1];
- inode = ilookup(sb, (unsigned long)fh[0]);
+ inode = ilookup5(sb, (unsigned long)(inum+fh[0]), shmem_match, vfh);
if (inode) {
- if (inode->i_generation == fh[1])
- de = d_find_alias(inode);
+ de = d_find_alias(inode);
iput(inode);
}
@@ -1982,7 +1991,7 @@ static struct dentry *shmem_decode_fh(st
int (*acceptable)(void *context, struct dentry *de),
void *context)
{
- if (len < 2)
+ if (len < 3)
return ERR_PTR(-ESTALE);
return sb->s_export_op->find_exported_dentry(sb, fh, NULL, acceptable, context);
@@ -1992,7 +2001,7 @@ static int shmem_encode_fh(struct dentry
{
struct inode *inode = dentry->d_inode;
- if (*len < 2)
+ if (*len < 3)
return 255;
if (hlist_unhashed(&inode->i_hash)) {
@@ -2004,14 +2013,16 @@ static int shmem_encode_fh(struct dentry
static DEFINE_SPINLOCK(lock);
spin_lock(&lock);
if (hlist_unhashed(&inode->i_hash))
- insert_inode_hash(inode);
+ __insert_inode_hash(inode,
+ inode->i_ino + inode->i_generation);
spin_unlock(&lock);
}
- fh[0] = inode->i_ino;
- fh[1] = inode->i_generation;
+ fh[0] = inode->i_generation;
+ fh[1] = inode->i_ino;
+ fh[2] = ((__u64)inode->i_ino) >> 32;
- *len = 2;
+ *len = 3;
return 1;
}
_
Patches currently in -mm which might be from neilb@xxxxxxx are
vfs-destroy-the-dentries-contributed-by-a-superblock-on-unmounting.patch
knfsd-add-nfs-export-support-to-tmpfs.patch
knfsd-add-nfs-export-support-to-tmpfs-fixes.patch
md-dm-reduce-stack-usage-with-stacked-block-devices.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
