LU-2904 llite: return valid fsid for statfs

Lustre uses 64-bits inode number to identify object on client side.
When re-export Lustre via NFS, NFS will detect whether support fsid
via statfs(). For the non-support case, it will only recognizes and
packs low 32-bits inode number in nfs handle. Such handle cannot be
used to locate the object properly.

To avoid patch linux kernel, Lustre client should generate fsid and
return it via statfs() to up layer.

Signed-off-by: Fan Yong <fan.yong@intel.com>
Change-Id: Ie292b26726a1b2aa7a763ef7c0507e3ed089323b
Reviewed-on: http://review.whamcloud.com/6493
Tested-by: Hudson
Tested-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Lai Siyao <lai.siyao@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index 05100c2..f999167 100644 (file)
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -512,6 +512,7 @@ struct ll_sb_info {
                                                  * clustred nfs */
         struct rmtacl_ctl_table   ll_rct;
         struct eacl_table         ll_et;
+       __kernel_fsid_t           ll_fsid;
 };
 
 #define LL_DEFAULT_MAX_RW_CHUNK      (32 * 1024 * 1024)
@@ -876,6 +877,7 @@ char *ll_get_fsname(struct super_block *sb, char *buf, int buflen);
 /* llite/llite_nfs.c */
 extern struct export_operations lustre_export_operations;
 __u32 get_uuid2int(const char *name, int len);
+void get_uuid2fsid(const char *name, int len, __kernel_fsid_t *fsid);
 struct inode *search_inode_for_lustre(struct super_block *sb,
                                      const struct lu_fid *fid);
 

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 99f8fd6..9a85d4d 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -595,8 +595,10 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
         /* s_dev is also used in lt_compare() to compare two fs, but that is
          * only a node-local comparison. */
         uuid = obd_get_uuid(sbi->ll_md_exp);
-        if (uuid != NULL)
-                sb->s_dev = get_uuid2int(uuid->uuid, strlen(uuid->uuid));
+       if (uuid != NULL) {
+               sb->s_dev = get_uuid2int(uuid->uuid, strlen(uuid->uuid));
+               get_uuid2fsid(uuid->uuid, strlen(uuid->uuid), &sbi->ll_fsid);
+       }
 
         if (data != NULL)
                 OBD_FREE_PTR(data);
@@ -1681,8 +1683,8 @@ int ll_statfs(struct dentry *de, struct kstatfs *sfs)
         sfs->f_blocks = osfs.os_blocks;
         sfs->f_bfree = osfs.os_bfree;
         sfs->f_bavail = osfs.os_bavail;
-
-        return 0;
+       sfs->f_fsid = ll_s2sbi(sb)->ll_fsid;
+       return 0;
 }
 
 void ll_inode_size_lock(struct inode *inode)

diff --git a/lustre/llite/llite_nfs.c b/lustre/llite/llite_nfs.c
index f840e23..fe1a90c 100644 (file)
--- a/lustre/llite/llite_nfs.c
+++ b/lustre/llite/llite_nfs.c
@@ -60,6 +60,22 @@ __u32 get_uuid2int(const char *name, int len)
         return (key0 << 1);
 }
 
+void get_uuid2fsid(const char *name, int len, __kernel_fsid_t *fsid)
+{
+       __u64 key = 0, key0 = 0x12a3fe2d, key1 = 0x37abe8f9;
+
+       while (len--) {
+               key = key1 + (key0 ^ (*name++ * 7152373));
+               if (key & 0x8000000000000000ULL)
+                       key -= 0x7fffffffffffffffULL;
+               key1 = key0;
+               key0 = key;
+       }
+
+       fsid->val[0] = key;
+       fsid->val[1] = key >> 32;
+}
+
 static int ll_nfs_test_inode(struct inode *inode, void *opaque)
 {
         return lu_fid_eq(&ll_i2info(inode)->lli_fid,