Merge branch 'fortglx/3.7/time' of git://git.linaro.org/people/jstultz/linux into timers/core

2 files changed, 14 insertions, 9 deletions

diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 07c91ca6017..3b91a7ad608 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -73,7 +73,7 @@ static inline void free_ea_wmap(struct inode *inode)
  *
  */
 static int jfs_create(struct inode *dip, struct dentry *dentry, umode_t mode,
-                struct nameidata *nd)
+                bool excl)
 {
         int rc = 0;
         tid_t tid;              /* transaction id */
@@ -176,8 +176,8 @@ static int jfs_create(struct inode *dip, struct dentry *dentry, umode_t mode,
                 unlock_new_inode(ip);
                 iput(ip);
         } else {
-                d_instantiate(dentry, ip);
                 unlock_new_inode(ip);
+                d_instantiate(dentry, ip);
         }
 
       out2:
@@ -309,8 +309,8 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, umode_t mode)
                 unlock_new_inode(ip);
                 iput(ip);
         } else {
-                d_instantiate(dentry, ip);
                 unlock_new_inode(ip);
+                d_instantiate(dentry, ip);
         }
 
       out2:
@@ -1043,8 +1043,8 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
                 unlock_new_inode(ip);
                 iput(ip);
         } else {
-                d_instantiate(dentry, ip);
                 unlock_new_inode(ip);
+                d_instantiate(dentry, ip);
         }
 
       out2:
@@ -1424,8 +1424,8 @@ static int jfs_mknod(struct inode *dir, struct dentry *dentry,
                 unlock_new_inode(ip);
                 iput(ip);
         } else {
-                d_instantiate(dentry, ip);
                 unlock_new_inode(ip);
+                d_instantiate(dentry, ip);
         }
 
       out1:
@@ -1436,7 +1436,7 @@ static int jfs_mknod(struct inode *dir, struct dentry *dentry,
         return rc;
 }
 
-static struct dentry *jfs_lookup(struct inode *dip, struct dentry *dentry, struct nameidata *nd)
+static struct dentry *jfs_lookup(struct inode *dip, struct dentry *dentry, unsigned int flags)
 {
         struct btstack btstack;
         ino_t inum;
@@ -1570,7 +1570,7 @@ out:
         return result;
 }
 
-static int jfs_ci_revalidate(struct dentry *dentry, struct nameidata *nd)
+static int jfs_ci_revalidate(struct dentry *dentry, unsigned int flags)
 {
         /*
          * This is not negative dentry. Always valid.
@@ -1589,7 +1589,7 @@ static int jfs_ci_revalidate(struct dentry *dentry, struct nameidata *nd)
          * This may be nfsd (or something), anyway, we can't see the
          * intent of this. So, since this can be for creation, drop it.
          */
-        if (!nd)
+        if (!flags)
                 return 0;
 
         /*
@@ -1597,7 +1597,7 @@ static int jfs_ci_revalidate(struct dentry *dentry, struct nameidata *nd)
          * case sensitive name which is specified by user if this is
          * for creation.
          */
-        if (nd->flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET))
+        if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET))
                 return 0;
         return 1;
 }
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 4a82950f412..c55c7452d28 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -601,6 +601,11 @@ static int jfs_sync_fs(struct super_block *sb, int wait)
 
         /* log == NULL indicates read-only mount */
         if (log) {
+                /*
+                 * Write quota structures to quota file, sync_blockdev() will
+                 * write them to disk later
+                 */
+                dquot_writeback_dquots(sb, -1);
                 jfs_flush_journal(log, wait);
                 jfs_syncpt(log, 0);
         }