staging: lustre: llite: remove ccflags from Makefile

[sfrench/cifs-2.6.git] / drivers / staging / lustre / lustre / lclient / glimpse.c

diff --git a/drivers/staging/lustre/lustre/lclient/glimpse.c b/drivers/staging/lustre/lustre/lclient/glimpse.c
index 7bbca4bf6b82aa3dd31049738e8aa3eb1411a544..b9f2bb66de218f4f312f08e65e5b164191134d39 100644 (file)
--- a/drivers/staging/lustre/lustre/lclient/glimpse.c
+++ b/drivers/staging/lustre/lustre/lclient/glimpse.c
@@ -40,20 +40,20 @@
  *   Author: Oleg Drokin <oleg.drokin@sun.com>
  */
 
-#include <linux/libcfs/libcfs.h>
-#include <obd_class.h>
-#include <obd_support.h>
-#include <obd.h>
+#include "../../include/linux/libcfs/libcfs.h"
+#include "../include/obd_class.h"
+#include "../include/obd_support.h"
+#include "../include/obd.h"
 
-# include <lustre_dlm.h>
-# include <lustre_lite.h>
-# include <lustre_mdc.h>
-# include <linux/pagemap.h>
-# include <linux/file.h>
+#include "../include/lustre_dlm.h"
+#include "../include/lustre_lite.h"
+#include "../include/lustre_mdc.h"
+#include <linux/pagemap.h>
+#include <linux/file.h>
 
-#include "cl_object.h"
-#include "lclient.h"
-# include "../llite/llite_internal.h"
+#include "../include/cl_object.h"
+#include "../include/lclient.h"
+#include "../llite/llite_internal.h"
 
 static const struct cl_lock_descr whole_file = {
        .cld_start = 0,
@@ -177,7 +177,7 @@ static int cl_io_get(struct inode *inode, struct lu_env **envout,
                        io->ci_obj = clob;
                        *envout = env;
                        *ioout  = io;
-                       result = +1;
+                       result = 1;
                } else
                        result = PTR_ERR(env);
        } else
@@ -204,7 +204,7 @@ int cl_glimpse_size0(struct inode *inode, int agl)
 
        result = cl_io_get(inode, &env, &io, &refcheck);
        if (result > 0) {
-       again:
+again:
                io->ci_verify_layout = 1;
                result = cl_io_init(env, io, CIT_MISC, io->ci_obj);
                if (result > 0)