Patched in Tegra support.

1 files changed, 53 insertions, 72 deletions

diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c
index 36549a46e31..3b256b50f7d 100644
--- a/fs/ceph/ioctl.c
+++ b/fs/ceph/ioctl.c
@@ -26,7 +26,8 @@ static long ceph_ioctl_get_layout(struct file *file, void __user *arg)
                 l.stripe_count = ceph_file_layout_stripe_count(ci->i_layout);
                 l.object_size = ceph_file_layout_object_size(ci->i_layout);
                 l.data_pool = le32_to_cpu(ci->i_layout.fl_pg_pool);
-                l.preferred_osd = (s32)-1;
+                l.preferred_osd =
+                        (s32)le32_to_cpu(ci->i_layout.fl_pg_preferred);
                 if (copy_to_user(arg, &l, sizeof(l)))
                         return -EFAULT;
         }
@@ -34,33 +35,6 @@ static long ceph_ioctl_get_layout(struct file *file, void __user *arg)
         return err;
 }
 
-static long __validate_layout(struct ceph_mds_client *mdsc,
-                              struct ceph_ioctl_layout *l)
-{
-        int i, err;
-
-        /* validate striping parameters */
-        if ((l->object_size & ~PAGE_MASK) ||
-            (l->stripe_unit & ~PAGE_MASK) ||
-            (l->stripe_unit != 0 &&
-             ((unsigned)l->object_size % (unsigned)l->stripe_unit)))
-                return -EINVAL;
-
-        /* make sure it's a valid data pool */
-        mutex_lock(&mdsc->mutex);
-        err = -EINVAL;
-        for (i = 0; i < mdsc->mdsmap->m_num_data_pg_pools; i++)
-                if (mdsc->mdsmap->m_data_pg_pools[i] == l->data_pool) {
-                        err = 0;
-                        break;
-                }
-        mutex_unlock(&mdsc->mutex);
-        if (err)
-                return err;
-
-        return 0;
-}
-
 static long ceph_ioctl_set_layout(struct file *file, void __user *arg)
 {
         struct inode *inode = file->f_dentry->d_inode;
@@ -68,42 +42,32 @@ static long ceph_ioctl_set_layout(struct file *file, void __user *arg)
         struct ceph_mds_client *mdsc = ceph_sb_to_client(inode->i_sb)->mdsc;
         struct ceph_mds_request *req;
         struct ceph_ioctl_layout l;
-        struct ceph_inode_info *ci = ceph_inode(file->f_dentry->d_inode);
-        struct ceph_ioctl_layout nl;
-        int err;
+        int err, i;
 
+        /* copy and validate */
         if (copy_from_user(&l, arg, sizeof(l)))
                 return -EFAULT;
 
-        /* validate changed params against current layout */
-        err = ceph_do_getattr(file->f_dentry->d_inode, CEPH_STAT_CAP_LAYOUT);
-        if (err)
-                return err;
-
-        memset(&nl, 0, sizeof(nl));
-        if (l.stripe_count)
-                nl.stripe_count = l.stripe_count;
-        else
-                nl.stripe_count = ceph_file_layout_stripe_count(ci->i_layout);
-        if (l.stripe_unit)
-                nl.stripe_unit = l.stripe_unit;
-        else
-                nl.stripe_unit = ceph_file_layout_su(ci->i_layout);
-        if (l.object_size)
-                nl.object_size = l.object_size;
-        else
-                nl.object_size = ceph_file_layout_object_size(ci->i_layout);
-        if (l.data_pool)
-                nl.data_pool = l.data_pool;
-        else
-                nl.data_pool = ceph_file_layout_pg_pool(ci->i_layout);
-
-        /* this is obsolete, and always -1 */
-        nl.preferred_osd = le64_to_cpu(-1);
-
-        err = __validate_layout(mdsc, &nl);
-        if (err)
-                return err;
+        if ((l.object_size & ~PAGE_MASK) ||
+            (l.stripe_unit & ~PAGE_MASK) ||
+            !l.stripe_unit ||
+            (l.object_size &&
+             (unsigned)l.object_size % (unsigned)l.stripe_unit))
+                return -EINVAL;
+
+        /* make sure it's a valid data pool */
+        if (l.data_pool > 0) {
+                mutex_lock(&mdsc->mutex);
+                err = -EINVAL;
+                for (i = 0; i < mdsc->mdsmap->m_num_data_pg_pools; i++)
+                        if (mdsc->mdsmap->m_data_pg_pools[i] == l.data_pool) {
+                                err = 0;
+                                break;
+                        }
+                mutex_unlock(&mdsc->mutex);
+                if (err)
+                        return err;
+        }
 
         req = ceph_mdsc_create_request(mdsc, CEPH_MDS_OP_SETLAYOUT,
                                        USE_AUTH_MDS);
@@ -120,6 +84,8 @@ static long ceph_ioctl_set_layout(struct file *file, void __user *arg)
         req->r_args.setlayout.layout.fl_object_size =
                 cpu_to_le32(l.object_size);
         req->r_args.setlayout.layout.fl_pg_pool = cpu_to_le32(l.data_pool);
+        req->r_args.setlayout.layout.fl_pg_preferred =
+                cpu_to_le32(l.preferred_osd);
 
         parent_inode = ceph_get_dentry_parent_inode(file->f_dentry);
         err = ceph_mdsc_do_request(mdsc, parent_inode, req);
@@ -139,16 +105,33 @@ static long ceph_ioctl_set_layout_policy (struct file *file, void __user *arg)
         struct inode *inode = file->f_dentry->d_inode;
         struct ceph_mds_request *req;
         struct ceph_ioctl_layout l;
-        int err;
+        int err, i;
         struct ceph_mds_client *mdsc = ceph_sb_to_client(inode->i_sb)->mdsc;
 
         /* copy and validate */
         if (copy_from_user(&l, arg, sizeof(l)))
                 return -EFAULT;
 
-        err = __validate_layout(mdsc, &l);
-        if (err)
-                return err;
+        if ((l.object_size & ~PAGE_MASK) ||
+            (l.stripe_unit & ~PAGE_MASK) ||
+            !l.stripe_unit ||
+            (l.object_size &&
+                (unsigned)l.object_size % (unsigned)l.stripe_unit))
+                return -EINVAL;
+
+        /* make sure it's a valid data pool */
+        if (l.data_pool > 0) {
+                mutex_lock(&mdsc->mutex);
+                err = -EINVAL;
+                for (i = 0; i < mdsc->mdsmap->m_num_data_pg_pools; i++)
+                        if (mdsc->mdsmap->m_data_pg_pools[i] == l.data_pool) {
+                                err = 0;
+                                break;
+                        }
+                mutex_unlock(&mdsc->mutex);
+                if (err)
+                        return err;
+        }
 
         req = ceph_mdsc_create_request(mdsc, CEPH_MDS_OP_SETDIRLAYOUT,
                                        USE_AUTH_MDS);
@@ -166,6 +149,8 @@ static long ceph_ioctl_set_layout_policy (struct file *file, void __user *arg)
                         cpu_to_le32(l.object_size);
         req->r_args.setlayout.layout.fl_pg_pool =
                         cpu_to_le32(l.data_pool);
+        req->r_args.setlayout.layout.fl_pg_preferred =
+                        cpu_to_le32(l.preferred_osd);
 
         err = ceph_mdsc_do_request(mdsc, inode, req);
         ceph_mdsc_put_request(req);
@@ -187,18 +172,14 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg)
         u64 tmp;
         struct ceph_object_layout ol;
         struct ceph_pg pgid;
-        int r;
 
         /* copy and validate */
         if (copy_from_user(&dl, arg, sizeof(dl)))
                 return -EFAULT;
 
         down_read(&osdc->map_sem);
-        r = ceph_calc_file_object_mapping(&ci->i_layout, dl.file_offset, &len,
-                                          &dl.object_no, &dl.object_offset,
-                                          &olen);
-        if (r < 0)
-                return -EIO;
+        ceph_calc_file_object_mapping(&ci->i_layout, dl.file_offset, &len,
+                                      &dl.object_no, &dl.object_offset, &olen);
         dl.file_offset -= dl.object_offset;
         dl.object_size = ceph_file_layout_object_size(ci->i_layout);
         dl.block_size = ceph_file_layout_su(ci->i_layout);
@@ -238,11 +219,11 @@ static long ceph_ioctl_lazyio(struct file *file)
         struct ceph_inode_info *ci = ceph_inode(inode);
 
         if ((fi->fmode & CEPH_FILE_MODE_LAZY) == 0) {
-                spin_lock(&ci->i_ceph_lock);
+                spin_lock(&inode->i_lock);
                 ci->i_nr_by_mode[fi->fmode]--;
                 fi->fmode |= CEPH_FILE_MODE_LAZY;
                 ci->i_nr_by_mode[fi->fmode]++;
-                spin_unlock(&ci->i_ceph_lock);
+                spin_unlock(&inode->i_lock);
                 dout("ioctl_layzio: file %p marked lazy\n", file);
 
                 ceph_check_caps(ci, 0, NULL);