LU-3531 llite: fix "lfs getdirstripe" to show stripe info

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

diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c
index 3db8073..bde8a35 100644 (file)
--- a/lustre/llite/xattr.c
+++ b/lustre/llite/xattr.c
@@ -476,15 +476,15 @@ ssize_t ll_getxattr(struct dentry *dentry, const char *name,
 
                lsm = ccc_inode_lsm_get(inode);
                if (lsm == NULL) {
-                        if (S_ISDIR(inode->i_mode)) {
-                                rc = ll_dir_getstripe(inode, &lmm,
-                                                      &lmmsize, &request);
-                        } else {
-                                rc = -ENODATA;
-                        }
-                } else {
-                        /* LSM is present already after lookup/getattr call.
-                         * we need to grab layout lock once it is implemented */
+                       if (S_ISDIR(inode->i_mode)) {
+                               rc = ll_dir_getstripe(inode, (void **)&lmm,
+                                                     &lmmsize, &request, 0);
+                       } else {
+                               rc = -ENODATA;
+                       }
+               } else {
+                       /* LSM is present already after lookup/getattr call.
+                        * we need to grab layout lock once it is implemented */
                        rc = obd_packmd(ll_i2dtexp(inode), &lmm, lsm);
                        lmmsize = rc;
                }
@@ -571,10 +571,11 @@ ssize_t ll_listxattr(struct dentry *dentry, char *buffer, size_t size)
        }
        if (S_ISREG(inode->i_mode)) {
                if (!ll_i2info(inode)->lli_has_smd)
-                        rc2 = -1;
-        } else if (S_ISDIR(inode->i_mode)) {
-                rc2 = ll_dir_getstripe(inode, &lmm, &lmmsize, &request);
-        }
+                       rc2 = -1;
+       } else if (S_ISDIR(inode->i_mode)) {
+               rc2 = ll_dir_getstripe(inode, (void **)&lmm, &lmmsize, &request,
+                                      0);
+       }
 
         if (rc2 < 0) {
                 GOTO(out, rc2 = 0);