From: yury <yury>
Date: Wed, 12 Apr 2006 11:31:28 +0000 (+0000)
Subject: - fixes in lli_nfs.c. Seems nfs will not work due to incompatibility with fids, but... 
X-Git-Tag: v1_8_0_110~486^2~2038
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=32190d4470ade8aeef3cbc1ac2b797f9790353f9;p=fs%2Flustre-release.git

- fixes in lli_nfs.c. Seems nfs will not work due to incompatibility with fids, but in any  case it will not cause oops.
---

diff --git a/lustre/llite/llite_nfs.c b/lustre/llite/llite_nfs.c
index b91b51c..0d8244f 100644
--- a/lustre/llite/llite_nfs.c
+++ b/lustre/llite/llite_nfs.c
@@ -210,14 +210,14 @@ int ll_dentry_to_fh(struct dentry *dentry, __u32 *datap, int *lenp,
 {
         struct inode *child = dentry->d_inode;
         
-        if (*lenp < 3)
+        if (*lenp < 5)
                 return 255;
 
         /* XXX: there is suspection that @datap is 5*4 bytes max long, so that
          * 10*4 bytes (two fids + two times mode) does not fit into it. Not sure
          * how to fix it though. */
         ll_fid_to_fh(&ll_i2info(child)->lli_fid, (__u32 *)&child->i_mode, datap);
-        if (*lenp == 3 || *lenp == 5 || S_ISDIR(child->i_mode)) {
+        if (*lenp == 5 || S_ISDIR(child->i_mode)) {
                 *lenp = 5;
                 return 1;
         }