Merge branch 'iocb' into for-next

[karo-tx-linux.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 48c1472bde4af3e3766c64da23be250ccf0df118..dfbd88a7f76915a7c56e3a4328ed109fde527636 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -990,9 +990,6 @@ struct file_lock_context {
        struct list_head        flc_flock;
        struct list_head        flc_posix;
        struct list_head        flc_lease;
-       int                     flc_flock_cnt;
-       int                     flc_posix_cnt;
-       int                     flc_lease_cnt;
 };
 
 /* The following constant reflects the upper bound of the file/locking space */
@@ -2169,7 +2166,7 @@ struct filename {
        const __user char       *uptr;  /* original userland pointer */
        struct audit_names      *aname;
        int                     refcnt;
-       bool                    separate; /* should "name" be freed? */
+       const char              iname[];
 };
 
 extern long vfs_truncate(struct path *, loff_t);