5 files changed, 46 insertions, 14 deletions

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index f605753c8fe9..8d74ad7ba556 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -1811,7 +1811,7 @@ out:
         spin_unlock(&ci->i_unsafe_lock);
 }
 
-int ceph_fsync(struct file *file, int datasync)
+int ceph_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 {
         struct inode *inode = file->f_mapping->host;
         struct ceph_inode_info *ci = ceph_inode(inode);
@@ -1822,9 +1822,10 @@ int ceph_fsync(struct file *file, int datasync)
         dout("fsync %p%s\n", inode, datasync ? " datasync" : "");
         sync_write_wait(inode);
 
-        ret = filemap_write_and_wait(inode->i_mapping);
+        ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
         if (ret < 0)
                 return ret;
+        mutex_lock(&inode->i_mutex);
 
         dirty = try_flush_caps(inode, NULL, &flush_tid);
         dout("fsync dirty caps are %s\n", ceph_cap_string(dirty));
@@ -1841,6 +1842,7 @@ int ceph_fsync(struct file *file, int datasync)
         }
 
         dout("fsync %p%s done\n", inode, datasync ? " datasync" : "");
+        mutex_unlock(&inode->i_mutex);
         return ret;
 }
 
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 852ff8600ac9..382abc9a6a54 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -270,7 +270,7 @@ static int ceph_readdir(struct file *filp, void *dirent, filldir_t filldir)
                 off = 1;
         }
         if (filp->f_pos == 1) {
-                ino_t ino = filp->f_dentry->d_parent->d_inode->i_ino;
+                ino_t ino = parent_ino(filp->f_dentry);
                 dout("readdir off 1 -> '..'\n");
                 if (filldir(dirent, "..", 2, ceph_make_fpos(0, 1),
                             ceph_translate_ino(inode->i_sb, ino),
@@ -464,14 +464,19 @@ static loff_t ceph_dir_llseek(struct file *file, loff_t offset, int origin)
         loff_t retval;
 
         mutex_lock(&inode->i_mutex);
+        retval = -EINVAL;
         switch (origin) {
         case SEEK_END:
                 offset += inode->i_size + 2;   /* FIXME */
                 break;
         case SEEK_CUR:
                 offset += file->f_pos;
+        case SEEK_SET:
+                break;
+        default:
+                goto out;
         }
-        retval = -EINVAL;
+
         if (offset >= 0 && offset <= inode->i_sb->s_maxbytes) {
                 if (offset != file->f_pos) {
                         file->f_pos = offset;
@@ -495,6 +500,7 @@ static loff_t ceph_dir_llseek(struct file *file, loff_t offset, int origin)
                 if (offset > old_offset)
                         fi->dir_release_count--;
         }
+out:
         mutex_unlock(&inode->i_mutex);
         return retval;
 }
@@ -592,7 +598,6 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry,
         /* open (but not create!) intent? */
         if (nd &&
             (nd->flags & LOOKUP_OPEN) &&
-            (nd->flags & LOOKUP_CONTINUE) == 0 && /* only open last component */
             !(nd->intent.open.flags & O_CREAT)) {
                 int mode = nd->intent.open.create_mode & ~current->fs->umask;
                 return ceph_lookup_open(dir, dentry, nd, mode, 1);
@@ -1144,7 +1149,8 @@ static ssize_t ceph_read_dir(struct file *file, char __user *buf, size_t size,
  * an fsync() on a dir will wait for any uncommitted directory
  * operations to commit.
  */
-static int ceph_dir_fsync(struct file *file, int datasync)
+static int ceph_dir_fsync(struct file *file, loff_t start, loff_t end,
+                          int datasync)
 {
         struct inode *inode = file->f_path.dentry->d_inode;
         struct ceph_inode_info *ci = ceph_inode(inode);
@@ -1154,6 +1160,11 @@ static int ceph_dir_fsync(struct file *file, int datasync)
         int ret = 0;
 
         dout("dir_fsync %p\n", inode);
+        ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        if (ret)
+                return ret;
+        mutex_lock(&inode->i_mutex);
+
         spin_lock(&ci->i_unsafe_lock);
         if (list_empty(head))
                 goto out;
@@ -1187,6 +1198,8 @@ static int ceph_dir_fsync(struct file *file, int datasync)
         } while (req->r_tid < last_tid);
 out:
         spin_unlock(&ci->i_unsafe_lock);
+        mutex_unlock(&inode->i_mutex);
+
         return ret;
 }
 
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 45fbd69daabe..ce549d31eeb7 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -229,7 +229,7 @@ struct dentry *ceph_lookup_open(struct inode *dir, struct dentry *dentry,
         struct ceph_mds_request *req;
         struct dentry *ret;
         int err;
-        int flags = nd->intent.open.flags - 1;  /* silly vfs! */
+        int flags = nd->intent.open.flags;
 
         dout("ceph_lookup_open dentry %p '%.*s' flags %d mode 0%o\n",
              dentry, dentry->d_name.len, dentry->d_name.name, flags, mode);
@@ -797,13 +797,16 @@ static loff_t ceph_llseek(struct file *file, loff_t offset, int origin)
 
         mutex_lock(&inode->i_mutex);
         __ceph_do_pending_vmtruncate(inode);
-        switch (origin) {
-        case SEEK_END:
+        if (origin != SEEK_CUR || origin != SEEK_SET) {
                 ret = ceph_do_getattr(inode, CEPH_STAT_CAP_SIZE);
                 if (ret < 0) {
                         offset = ret;
                         goto out;
                 }
+        }
+
+        switch (origin) {
+        case SEEK_END:
                 offset += inode->i_size;
                 break;
         case SEEK_CUR:
@@ -819,6 +822,19 @@ static loff_t ceph_llseek(struct file *file, loff_t offset, int origin)
                 }
                 offset += file->f_pos;
                 break;
+        case SEEK_DATA:
+                if (offset >= inode->i_size) {
+                        ret = -ENXIO;
+                        goto out;
+                }
+                break;
+        case SEEK_HOLE:
+                if (offset >= inode->i_size) {
+                        ret = -ENXIO;
+                        goto out;
+                }
+                offset = inode->i_size;
+                break;
         }
 
         if (offset < 0 || offset > inode->i_sb->s_maxbytes) {
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 5f0013aafa4b..095799ba9dd1 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1801,17 +1801,17 @@ int ceph_do_getattr(struct inode *inode, int mask)
  * Check inode permissions.  We verify we have a valid value for
  * the AUTH cap, then call the generic handler.
  */
-int ceph_permission(struct inode *inode, int mask, unsigned int flags)
+int ceph_permission(struct inode *inode, int mask)
 {
         int err;
 
-        if (flags & IPERM_FLAG_RCU)
+        if (mask & MAY_NOT_BLOCK)
                 return -ECHILD;
 
         err = ceph_do_getattr(inode, CEPH_CAP_AUTH_SHARED);
 
         if (!err)
-                err = generic_permission(inode, mask, flags, NULL);
+                err = generic_permission(inode, mask);
         return err;
 }
 
diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 35dc9656e499..a23eed526f05 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -695,7 +695,7 @@ extern void ceph_queue_invalidate(struct inode *inode);
 extern void ceph_queue_writeback(struct inode *inode);
 
 extern int ceph_do_getattr(struct inode *inode, int mask);
-extern int ceph_permission(struct inode *inode, int mask, unsigned int flags);
+extern int ceph_permission(struct inode *inode, int mask);
 extern int ceph_setattr(struct dentry *dentry, struct iattr *attr);
 extern int ceph_getattr(struct vfsmount *mnt, struct dentry *dentry,
                         struct kstat *stat);
@@ -731,7 +731,8 @@ extern void ceph_put_cap(struct ceph_mds_client *mdsc,
 
 extern void ceph_queue_caps_release(struct inode *inode);
 extern int ceph_write_inode(struct inode *inode, struct writeback_control *wbc);
-extern int ceph_fsync(struct file *file, int datasync);
+extern int ceph_fsync(struct file *file, loff_t start, loff_t end,
+                      int datasync);
 extern void ceph_kick_flushing_caps(struct ceph_mds_client *mdsc,
                                     struct ceph_mds_session *session);
 extern struct ceph_cap *ceph_get_cap_for_mds(struct ceph_inode_info *ci,