Merge branch 'linus_origin' into hotfixes

[safe/jmp/linux-2.6] / fs / compat.c

diff --git a/fs/compat.c b/fs/compat.c
index 43ca016..2ce4456 100644 (file)
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -702,9 +702,6 @@ static int do_nfs4_super_data_conv(void *raw_data)
                real->flags = raw->flags;
                real->version = raw->version;
        }
-       else {
-               return -EINVAL;
-       }
 
        return 0;
 }