cifs: new helper function: cifs_revalidate_mapping

Consolidate a bit of code. In a later patch we'll expand this to fix
some races.

Signed-off-by: Jeff Layton <jlayton@poochiereds.net>
Signed-off-by: Steve French <smfrench@gmail.com>

diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
index 89eab9a55f1816cc70c94a7be528489baabe7dcd..63d51274dfbf57f6a4f322fca7a1e30012e3ca95 100644 (file)
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@ -75,6 +75,7 @@ extern int cifs_revalidate_dentry_attr(struct dentry *);
 extern int cifs_revalidate_file(struct file *filp);
 extern int cifs_revalidate_dentry(struct dentry *);
 extern int cifs_invalidate_mapping(struct inode *inode);
+extern int cifs_revalidate_mapping(struct inode *inode);
 extern int cifs_getattr(struct vfsmount *, struct dentry *, struct kstat *);
 extern int cifs_setattr(struct dentry *, struct iattr *);
 

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index fa9ef8d902b523880819ecfd7cb2275f4cbda34a..ff420b275777bdab21890f7bd5a4b6fd5c86e001 100644 (file)
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -1779,6 +1779,14 @@ cifs_invalidate_mapping(struct inode *inode)
        return rc;
 }
 
+int
+cifs_revalidate_mapping(struct inode *inode)
+{
+       if (test_bit(CIFS_INO_INVALID_MAPPING, &CIFS_I(inode)->flags))
+               return cifs_invalidate_mapping(inode);
+       return 0;
+}
+
 int cifs_revalidate_file_attr(struct file *filp)
 {
        int rc = 0;
@@ -1845,9 +1853,7 @@ int cifs_revalidate_file(struct file *filp)
        if (rc)
                return rc;
 
-       if (test_bit(CIFS_INO_INVALID_MAPPING, &CIFS_I(inode)->flags))
-               rc = cifs_invalidate_mapping(inode);
-       return rc;
+       return cifs_revalidate_mapping(inode);
 }
 
 /* revalidate a dentry's inode attributes */
@@ -1860,9 +1866,7 @@ int cifs_revalidate_dentry(struct dentry *dentry)
        if (rc)
                return rc;
 
-       if (test_bit(CIFS_INO_INVALID_MAPPING, &CIFS_I(inode)->flags))
-               rc = cifs_invalidate_mapping(inode);
-       return rc;
+       return cifs_revalidate_mapping(inode);
 }
 
 int cifs_getattr(struct vfsmount *mnt, struct dentry *dentry,