Linux 3.3 compat, iops->create()/mkdir()/mknod()

[zfs.git] / module / zfs / zpl_inode.c

diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c
index 2d197a4..1f6169b 100644 (file)
--- a/module/zfs/zpl_inode.c
+++ b/module/zfs/zpl_inode.c
@@ -25,6 +25,7 @@
 
 #include <sys/zfs_vfsops.h>
 #include <sys/zfs_vnops.h>
+#include <sys/zfs_znode.h>
 #include <sys/vfs.h>
 #include <sys/zpl.h>
 
@@ -51,9 +52,9 @@ zpl_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
        return d_splice_alias(ip, dentry);
 }
 
-static void
+void
 zpl_vap_init(vattr_t *vap, struct inode *dir, struct dentry *dentry,
-    mode_t mode, cred_t *cr)
+    zpl_umode_t mode, cred_t *cr)
 {
        vap->va_mask = ATTR_MODE;
        vap->va_mode = mode;
@@ -70,7 +71,7 @@ zpl_vap_init(vattr_t *vap, struct inode *dir, struct dentry *dentry,
 }
 
 static int
-zpl_create(struct inode *dir, struct dentry *dentry, int mode,
+zpl_create(struct inode *dir, struct dentry *dentry, zpl_umode_t mode,
     struct nameidata *nd)
 {
        cred_t *cr = CRED();
@@ -92,7 +93,8 @@ zpl_create(struct inode *dir, struct dentry *dentry, int mode,
 }
 
 static int
-zpl_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
+zpl_mknod(struct inode *dir, struct dentry *dentry, zpl_umode_t mode,
+    dev_t rdev)
 {
        cred_t *cr = CRED();
        struct inode *ip;
@@ -135,7 +137,7 @@ zpl_unlink(struct inode *dir, struct dentry *dentry)
 }
 
 static int
-zpl_mkdir(struct inode *dir, struct dentry *dentry, int mode)
+zpl_mkdir(struct inode *dir, struct dentry *dentry, zpl_umode_t mode)
 {
        cred_t *cr = CRED();
        vattr_t *vap;
@@ -171,8 +173,20 @@ zpl_rmdir(struct inode * dir, struct dentry *dentry)
 static int
 zpl_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
 {
+       boolean_t issnap = ITOZSB(dentry->d_inode)->z_issnap;
        int error;
 
+       /*
+        * Ensure MNT_SHRINKABLE is set on snapshots to ensure they are
+        * unmounted automatically with the parent file system.  This
+        * is done on the first getattr because it's not easy to get the
+        * vfsmount structure at mount time.  This call path is explicitly
+        * marked unlikely to avoid any performance impact.  FWIW, ext4
+        * resorts to a similar trick for sysadmin convenience.
+        */
+       if (unlikely(issnap && !(mnt->mnt_flags & MNT_SHRINKABLE)))
+               mnt->mnt_flags |= MNT_SHRINKABLE;
+
        error = -zfs_getattr_fast(dentry->d_inode, stat);
        ASSERT3S(error, <=, 0);
 
@@ -342,6 +356,15 @@ zpl_truncate_range(struct inode* ip, loff_t start, loff_t end)
        crfree(cr);
 }
 
+#ifdef HAVE_INODE_FALLOCATE
+static long
+zpl_fallocate(struct inode *ip, int mode, loff_t offset, loff_t len)
+{
+       return zpl_fallocate_common(ip, mode, offset, len);
+}
+#endif /* HAVE_INODE_FALLOCATE */
+
+
 const struct inode_operations zpl_inode_operations = {
        .create         = zpl_create,
        .link           = zpl_link,
@@ -358,6 +381,9 @@ const struct inode_operations zpl_inode_operations = {
        .removexattr    = generic_removexattr,
        .listxattr      = zpl_xattr_list,
        .truncate_range = zpl_truncate_range,
+#ifdef HAVE_INODE_FALLOCATE
+       .fallocate      = zpl_fallocate,
+#endif /* HAVE_INODE_FALLOCATE */
 };
 
 const struct inode_operations zpl_dir_inode_operations = {