Merge from posix_stable.

diff --git a/lustre/include/linux/lustre_mds.h b/lustre/include/linux/lustre_mds.h
index 9238982..db098e5 100644 (file)
--- a/lustre/include/linux/lustre_mds.h
+++ b/lustre/include/linux/lustre_mds.h
@@ -113,8 +113,7 @@ int mds_update_unpack(struct ptlrpc_request *, int offset,
                       struct mds_update_record *);
 
 void mds_getattr_pack(struct ptlrpc_request *req, int offset,
-                      struct inode *inode, 
-                      const char *name, int namelen);
+                      struct inode *inode, const char *name, int namelen);
 void mds_setattr_pack(struct ptlrpc_request *, int offset, struct inode *,
                       struct iattr *, const char *name, int namelen);
 void mds_create_pack(struct ptlrpc_request *, int offset, struct inode *,
@@ -153,6 +152,8 @@ int mdc_getstatus(struct obd_conn *conn,
 int mdc_getattr(struct obd_conn *conn,
                 ino_t ino, int type, unsigned long valid, size_t ea_size,
                 struct ptlrpc_request **request);
+int mdc_statfs(struct obd_conn *conn,
+               struct statfs *sfs, struct ptlrpc_request **request);
 int mdc_setattr(struct obd_conn *conn,
                 struct inode *, struct iattr *iattr, struct ptlrpc_request **);
 int mdc_open(struct obd_conn *conn,

diff --git a/lustre/include/linux/obd_class.h b/lustre/include/linux/obd_class.h
index dc0f6c6..dc583f4 100644 (file)
--- a/lustre/include/linux/obd_class.h
+++ b/lustre/include/linux/obd_class.h
@@ -62,7 +62,7 @@ extern void proc_lustre_remove_obd_entry(const char* name,
 
 #define OBD_BRW_READ    1
 #define OBD_BRW_WRITE   2
-#define OBD_BRW_RWMASK  OBD_BRW_READ | OBD_BRW_WRITE
+#define OBD_BRW_RWMASK  (OBD_BRW_READ | OBD_BRW_WRITE)
 #define OBD_BRW_CREATE  4
 
 #ifdef __KERNEL__
@@ -292,7 +292,7 @@ static inline int obd_punch(struct obd_conn *conn, struct obdo *tgt,
         RETURN(rc);
 }
 
-static inline int obd_brw(int rw, struct obd_conn *conn, obd_count num_oa,
+static inline int obd_brw(int cmd, struct obd_conn *conn, obd_count num_oa,
                           struct obdo **oa, obd_count *oa_bufs,
                           struct page **buf, obd_size *count, obd_off *offset,
                           obd_flag *flags, void *callback)
@@ -301,7 +301,12 @@ static inline int obd_brw(int rw, struct obd_conn *conn, obd_count num_oa,
         OBD_CHECK_SETUP(conn);
         OBD_CHECK_OP(conn,brw);
 
-        rc = OBP(conn->oc_dev, brw)(rw, conn, num_oa, oa, oa_bufs, buf,
+        if (!(cmd & OBD_BRW_RWMASK)) {
+                CERROR("obd_brw: cmd must be OBD_BRW_READ or OBD_BRW_WRITE\n");
+                LBUG();
+        }
+
+        rc = OBP(conn->oc_dev, brw)(cmd, conn, num_oa, oa, oa_bufs, buf,
                                     count, offset, flags, callback);
         RETURN(rc);
 }