diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 21:37:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 21:37:50 -0800 |
| commit | 5e04e7fe774794b837e1d3897e6b96ae2d06679a (patch) | |
| tree | c793e7d26f2d0e5448908b5c95756831d612c9fd /fs/cifs/inode.c | |
| parent | a5cf8b7dc5ae69c65ef366325dfc1abb507276c7 (diff) | |
| parent | 1b397f4f1c167dbf06397b3182fca521c00125c4 (diff) | |
| download | talos-op-linux-5e04e7fe774794b837e1d3897e6b96ae2d06679a.tar.gz talos-op-linux-5e04e7fe774794b837e1d3897e6b96ae2d06679a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
Diffstat (limited to 'fs/cifs/inode.c')
| -rw-r--r-- | fs/cifs/inode.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 912d401600f6..923d071163b2 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -283,7 +283,6 @@ int cifs_get_inode_info(struct inode **pinode, there Windows server or network appliances for which IndexNumber field is not guaranteed unique? */ -#ifdef CONFIG_CIFS_EXPERIMENTAL if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM){ int rc1 = 0; __u64 inode_num; @@ -299,7 +298,6 @@ int cifs_get_inode_info(struct inode **pinode, } else /* do we need cast or hash to ino? */ (*pinode)->i_ino = inode_num; } /* else ino incremented to unique num in new_inode*/ -#endif /* CIFS_EXPERIMENTAL */ insert_inode_hash(*pinode); } inode = *pinode; |
