Merge tag 'for-linus-20130318' of git://git.infradead.org/linux-mtd

[karo-tx-linux.git] / fs / ceph / export.c

diff --git a/fs/ceph/export.c b/fs/ceph/export.c
index ca3ab3f9ca70d87c6ab3a421c1e366b5b0d0fdbd..16796be53ca59450ebc81a074c84e7e08955a71b 100644 (file)
--- a/fs/ceph/export.c
+++ b/fs/ceph/export.c
@@ -81,7 +81,7 @@ static int ceph_encode_fh(struct inode *inode, u32 *rawfh, int *max_len,
                if (parent_inode) {
                        /* nfsd wants connectable */
                        *max_len = connected_handle_length;
-                       type = 255;
+                       type = FILEID_INVALID;
                } else {
                        dout("encode_fh %p\n", dentry);
                        fh->ino = ceph_ino(inode);
@@ -90,7 +90,7 @@ static int ceph_encode_fh(struct inode *inode, u32 *rawfh, int *max_len,
                }
        } else {
                *max_len = handle_length;
-               type = 255;
+               type = FILEID_INVALID;
        }
        if (dentry)
                dput(dentry);