From 8084ec1a0b2815bcc88c352049164008ac86ac88 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Mon, 20 Oct 2008 17:48:43 -0400 Subject: [PATCH] --- yaml --- r: 127435 b: refs/heads/master c: 548eaca46b3cf4419b6c2be839a106d8641ffb70 h: refs/heads/master i: 127433: ccd1b39623149d56e049b3bab17f7bc2c35fb716 127431: 881b1dd8613a6e75203519b39fff5e337b3e5075 v: v3 --- [refs] | 2 +- trunk/include/linux/nfsd/nfsfh.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2bec5ee52960..3acc3ea983ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bd9e7b62e6e1da3f881c40c73d93e9a212ce6de +refs/heads/master: 548eaca46b3cf4419b6c2be839a106d8641ffb70 diff --git a/trunk/include/linux/nfsd/nfsfh.h b/trunk/include/linux/nfsd/nfsfh.h index d1941cb965e9..b2e093870bc6 100644 --- a/trunk/include/linux/nfsd/nfsfh.h +++ b/trunk/include/linux/nfsd/nfsfh.h @@ -68,6 +68,10 @@ struct nfs_fhbase_old { * 1 - 4 byte user specified identifier * 2 - 4 byte major, 4 byte minor, 4 byte inode number - DEPRECATED * 3 - 4 byte device id, encoded for user-space, 4 byte inode number + * 4 - 4 byte inode number and 4 byte uuid + * 5 - 8 byte uuid + * 6 - 16 byte uuid + * 7 - 8 byte inode number and 16 byte uuid * * The fileid_type identified how the file within the filesystem is encoded. * This is (will be) passed to, and set by, the underlying filesystem if it supports