A mostly-fix for "mknod /mnt/lustre/foofo p". It doesn't fail outright

[fs/lustre-release.git] / lustre / include / linux / lustre_mds.h

diff --git a/lustre/include/linux/lustre_mds.h b/lustre/include/linux/lustre_mds.h
index 1c1d600..da851e3 100644 (file)
--- a/lustre/include/linux/lustre_mds.h
+++ b/lustre/include/linux/lustre_mds.h
@@ -53,11 +53,6 @@ struct mds_update_record {
         __u64 ur_time;
 };
 
-struct mds_objid {
-        __u64 mo_magic;
-        struct lov_md mo_lov_md;
-};
-
 #define MDS_LR_CLIENT  8192
 #define MDS_LR_SIZE     128
 
@@ -131,50 +126,59 @@ void mds_pack_inode2fid(struct ll_fid *fid, struct inode *inode);
 void mds_pack_inode2body(struct mds_body *body, struct inode *inode);
 
 /* mds/handler.c */
-struct dentry *mds_fid2dentry(struct mds_obd *mds, struct ll_fid *fid, struct vfsmount **mnt);
+struct dentry *mds_name2locked_dentry(struct mds_obd *mds, struct dentry *dir,
+                                      struct vfsmount **mnt, char *name,
+                                      int namelen, int lock_mode,
+                                      struct lustre_handle *lockh,
+                                      int dir_lock_mode);
+struct dentry *mds_fid2locked_dentry(struct mds_obd *mds, struct ll_fid *fid,
+                                     struct vfsmount **mnt, int lock_mode,
+                                     struct lustre_handle *lockh);
+struct dentry *mds_fid2dentry(struct mds_obd *mds, struct ll_fid *fid,
+                              struct vfsmount **mnt);
 int mds_lock_callback(struct lustre_handle *lockh, struct ldlm_lock_desc *desc,
                       void *data, int data_len, struct ptlrpc_request **req);
 int mds_reint(int offset, struct ptlrpc_request *req);
 
 /* mdc/mdc_request.c */
-static inline struct mdc_obd *mdc_conn2mdc(struct obd_conn *conn)
-{
-        return &conn->oc_dev->u.mdc;
-}
-
-int mdc_enqueue(struct obd_conn *conn, int lock_type, struct lookup_intent *it, 
-                int lock_mode, struct inode *dir, struct dentry *de,
-                struct lustre_handle *h, __u64 id, char *tgt, int tgtlen,
-                void *data, int datalen);
-int mdc_getstatus(struct obd_conn *conn,
+extern int mdc_con2cl(struct lustre_handle *conn, struct ptlrpc_client **cl,
+                      struct ptlrpc_connection **connection,
+                      struct lustre_handle **rconn);
+
+int mdc_enqueue(struct lustre_handle *conn, int lock_type,
+               struct lookup_intent *it, int lock_mode, struct inode *dir,
+               struct dentry *de, struct lustre_handle *h, __u64 id,
+               char *tgt, int tgtlen, void *data, int datalen);
+int mdc_getlovinfo(struct obd_device *obd, struct lustre_handle *mdc_connh,
+                   uuid_t **uuids, struct ptlrpc_request **request);
+int mdc_getstatus(struct lustre_handle *conn,
                 struct ll_fid *rootfid, __u64 *last_committed, __u64 *last_rcvd,
                 __u32 *last_xid, struct ptlrpc_request **);
-int mdc_getattr(struct obd_conn *conn,
-                ino_t ino, int type, unsigned long valid, size_t ea_size,
+int mdc_getattr(struct lustre_handle *conn,
+                obd_id ino, int type, unsigned long valid, size_t ea_size,
                 struct ptlrpc_request **request);
-int mdc_statfs(struct obd_conn *conn,
+int mdc_statfs(struct lustre_handle *conn,
                struct statfs *sfs, struct ptlrpc_request **request);
-int mdc_setattr(struct obd_conn *conn,
+int mdc_setattr(struct lustre_handle *conn,
                 struct inode *, struct iattr *iattr, struct ptlrpc_request **);
-int mdc_open(struct obd_conn *conn,
-             ino_t ino, int type, int flags, struct obdo *obdo, __u64 cookie, 
-             __u64 *fh, struct ptlrpc_request **request);
-int mdc_close(struct obd_conn *conn,
-              ino_t ino, int type, __u64 fh,  struct ptlrpc_request **req);
-int mdc_readpage(struct obd_conn *conn, ino_t ino,
+int mdc_open(struct lustre_handle *conn,
+             obd_id ino, int type, int flags, struct lov_stripe_md *md, __u64 cookie,  __u64 *fh, struct ptlrpc_request **request);
+int mdc_close(struct lustre_handle *conn,
+              obd_id ino, int type, __u64 fh,  struct ptlrpc_request **req);
+int mdc_readpage(struct lustre_handle *conn, obd_id ino,
                  int type, __u64 offset, char *addr, struct ptlrpc_request **);
-int mdc_create(struct obd_conn *conn,
-               struct inode *dir, const char *name, int namelen, 
+int mdc_create(struct lustre_handle *conn,
+               struct inode *dir, const char *name, int namelen,
                const char *tgt, int tgtlen, int mode, __u32 uid, __u32 gid,
-               __u64 time, __u64 rdev, struct obdo *obdo,
+               __u64 time, __u64 rdev, struct lov_stripe_md *md, 
                struct ptlrpc_request **);
-int mdc_unlink(struct obd_conn *conn,
+int mdc_unlink(struct lustre_handle *conn,
                struct inode *dir, struct inode *child, const char *name,
                int namelen, struct ptlrpc_request **);
-int mdc_link(struct obd_conn *conn,
+int mdc_link(struct lustre_handle *conn,
              struct dentry *src, struct inode *dir, const char *name,
              int namelen, struct ptlrpc_request **);
-int mdc_rename(struct obd_conn *conn,
+int mdc_rename(struct lustre_handle *conn,
                struct inode *src, struct inode *tgt, const char *old,
                int oldlen, const char *new, int newlen,
                struct ptlrpc_request **);
@@ -189,15 +193,17 @@ struct mds_fs_operations {
         int     (* fs_commit)(struct inode *inode, void *handle);
         int     (* fs_setattr)(struct dentry *dentry, void *handle,
                                struct iattr *iattr);
-        int     (* fs_set_obdo)(struct inode *inode, void *handle,
-                                struct obdo *obdo);
-        int     (* fs_get_obdo)(struct inode *inode, struct obdo *obdo);
+        int     (* fs_set_md)(struct inode *inode, void *handle,
+                              struct lov_stripe_md *md);
+        int     (* fs_get_md)(struct inode *inode, 
+                              struct lov_stripe_md *md);
         ssize_t (* fs_readpage)(struct file *file, char *buf, size_t count,
                                 loff_t *offset);
         void    (* fs_delete_inode)(struct inode *inode);
         void    (* cl_delete_inode)(struct inode *inode);
         int     (* fs_journal_data)(struct file *file);
         int     (* fs_set_last_rcvd)(struct mds_obd *mds, void *handle);
+        int     (* fs_statfs)(struct super_block *sb, struct statfs *sfs);
 };
 
 extern int mds_register_fs_type(struct mds_fs_operations *op, const char *name);
@@ -230,16 +236,16 @@ static inline int mds_fs_setattr(struct mds_obd *mds, struct dentry *dentry,
         return mds->mds_fsops->fs_setattr(dentry, handle, iattr);
 }
 
-static inline int mds_fs_set_obdo(struct mds_obd *mds, struct inode *inode,
-                                  void *handle, struct obdo *obdo)
+static inline int mds_fs_set_md(struct mds_obd *mds, struct inode *inode,
+                                  void *handle, struct lov_stripe_md *md)
 {
-        return mds->mds_fsops->fs_set_obdo(inode, handle, obdo);
+        return mds->mds_fsops->fs_set_md(inode, handle, md);
 }
 
-static inline int mds_fs_get_obdo(struct mds_obd *mds, struct inode *inode,
-                                  struct obdo *obdo)
+static inline int mds_fs_get_md(struct mds_obd *mds, struct inode *inode,
+                                  struct lov_stripe_md *md)
 {
-        return mds->mds_fsops->fs_get_obdo(inode, obdo);
+        return mds->mds_fsops->fs_get_md(inode, md);
 }
 
 static inline ssize_t mds_fs_readpage(struct mds_obd *mds, struct file *file,
@@ -263,6 +269,14 @@ static inline ssize_t mds_fs_journal_data(struct mds_obd *mds,
         return mds->mds_fsops->fs_journal_data(file);
 }
 
+static inline int mds_fs_statfs(struct mds_obd *mds, struct statfs *sfs)
+{
+        if (mds->mds_fsops->fs_statfs)
+                return mds->mds_fsops->fs_statfs(mds->mds_sb, sfs);
+
+        return vfs_statfs(mds->mds_sb, sfs);
+}
+
 #define MDS_FSOP_UNLINK         1
 #define MDS_FSOP_RMDIR          2
 #define MDS_FSOP_RENAME         3