LU-657 test: limit the write size in run_dd

[fs/lustre-release.git] / lustre / llite / llite_nfs.c

diff --git a/lustre/llite/llite_nfs.c b/lustre/llite/llite_nfs.c
index c3e327c..414f935 100644 (file)
--- a/lustre/llite/llite_nfs.c
+++ b/lustre/llite/llite_nfs.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -144,14 +144,14 @@ ll_iget_for_nfs(struct super_block *sb, struct lu_fid *fid, struct lu_fid *paren
          * It is an anonymous dentry without OST objects created yet.
          * We have to find the parent to tell MDS how to init lov objects.
          */
-        if (S_ISREG(inode->i_mode) && ll_i2info(inode)->lli_smd == NULL &&
-            parent != NULL) {
-                struct ll_inode_info *lli = ll_i2info(inode);
+       if (S_ISREG(inode->i_mode) && !ll_i2info(inode)->lli_has_smd &&
+           parent != NULL) {
+               struct ll_inode_info *lli = ll_i2info(inode);
 
-                cfs_spin_lock(&lli->lli_lock);
-                lli->lli_pfid = *parent;
-                cfs_spin_unlock(&lli->lli_lock);
-        }
+               spin_lock(&lli->lli_lock);
+               lli->lli_pfid = *parent;
+               spin_unlock(&lli->lli_lock);
+       }
 
         result = d_obtain_alias(inode);
         if (IS_ERR(result))
@@ -173,26 +173,32 @@ ll_iget_for_nfs(struct super_block *sb, struct lu_fid *fid, struct lu_fid *paren
  * 2 -- contains child file handle and parent file handle;
  * 255 -- error.
  */
+#ifndef HAVE_ENCODE_FH_PARENT
 static int ll_encode_fh(struct dentry *de, __u32 *fh, int *plen,
-                        int connectable)
+                       int connectable)
 {
-        struct inode *inode = de->d_inode;
-        struct inode *parent = de->d_parent->d_inode;
-        struct lustre_nfs_fid *nfs_fid = (void *)fh;
-        ENTRY;
+       struct inode *inode = de->d_inode;
+       struct inode *parent = de->d_parent->d_inode;
+#else
+static int ll_encode_fh(struct inode *inode, __u32 *fh, int *plen,
+                       struct inode *parent)
+{
+#endif
+       struct lustre_nfs_fid *nfs_fid = (void *)fh;
+       ENTRY;
 
-        CDEBUG(D_INFO, "encoding for (%lu,"DFID") maxlen=%d minlen=%d\n",
-              inode->i_ino, PFID(ll_inode2fid(inode)), *plen,
-              (int)sizeof(struct lustre_nfs_fid));
+       CDEBUG(D_INFO, "encoding for (%lu,"DFID") maxlen=%d minlen=%d\n",
+             inode->i_ino, PFID(ll_inode2fid(inode)), *plen,
+             (int)sizeof(struct lustre_nfs_fid));
 
-        if (*plen < sizeof(struct lustre_nfs_fid)/4)
-                RETURN(255);
+       if (*plen < sizeof(struct lustre_nfs_fid) / 4)
+               RETURN(255);
 
-        nfs_fid->lnf_child = *ll_inode2fid(inode);
-        nfs_fid->lnf_parent = *ll_inode2fid(parent);
-        *plen = sizeof(struct lustre_nfs_fid)/4;
+       nfs_fid->lnf_child = *ll_inode2fid(inode);
+       nfs_fid->lnf_parent = *ll_inode2fid(parent);
+       *plen = sizeof(struct lustre_nfs_fid) / 4;
 
-        RETURN(LUSTRE_NFS_FID);
+       RETURN(LUSTRE_NFS_FID);
 }
 
 static int ll_nfs_get_name_filldir(void *cookie, const char *name, int namelen,
@@ -217,8 +223,8 @@ static int ll_get_name(struct dentry *dentry, char *name,
                        struct dentry *child)
 {
         struct inode *dir = dentry->d_inode;
-        struct file *filp;
         struct ll_getname_data lgd;
+       __u64 offset = 0;
         int rc;
         ENTRY;
 
@@ -228,26 +234,17 @@ static int ll_get_name(struct dentry *dentry, char *name,
         if (!dir->i_fop)
                 GOTO(out, rc = -EINVAL);
 
-        filp = ll_dentry_open(dget(dentry), NULL, O_RDONLY, current_cred());
-        if (IS_ERR(filp))
-                GOTO(out, rc = PTR_ERR(filp));
-
-        if (!filp->f_op->readdir)
-                GOTO(out_close, rc = -EINVAL);
-
         lgd.lgd_name = name;
         lgd.lgd_fid = ll_i2info(child->d_inode)->lli_fid;
         lgd.lgd_found = 0;
 
-        cfs_mutex_lock(&dir->i_mutex);
-        rc = ll_readdir(filp, &lgd, ll_nfs_get_name_filldir);
-        cfs_mutex_unlock(&dir->i_mutex);
+       mutex_lock(&dir->i_mutex);
+       rc = ll_dir_read(dir, &offset, &lgd, ll_nfs_get_name_filldir);
+       mutex_unlock(&dir->i_mutex);
         if (!rc && !lgd.lgd_found)
                 rc = -ENOENT;
         EXIT;
 
-out_close:
-        fput(filp);
 out:
         return rc;
 }
@@ -333,8 +330,8 @@ static struct dentry *ll_get_parent(struct dentry *dchild)
         op_data = ll_prep_md_op_data(NULL, dir, NULL, dotdot,
                                      strlen(dotdot), 0,
                                      LUSTRE_OPC_ANY, NULL);
-        if (op_data == NULL)
-                RETURN(ERR_PTR(-ENOMEM));
+        if (IS_ERR(op_data))
+                RETURN((void *)op_data);
 
         rc = md_getattr_name(sbi->ll_md_exp, op_data, &req);
         ll_finish_md_op_data(op_data);