diff --git a/[refs] b/[refs] index d751f936ecd8..d2c507a61563 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86c98e8cdb21ff4628f4d48559ab6e006380fa4b +refs/heads/master: 295cc522c2b2834b302424e41ebb5846df6d61bd diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index 9cd2075c4a39..e0569e4ab2d5 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -1552,11 +1552,6 @@ struct block_device_operations; #define HAVE_COMPAT_IOCTL 1 #define HAVE_UNLOCKED_IOCTL 1 -/* - * NOTE: - * all file operations except setlease can be called without - * the big kernel lock held in all filesystems. - */ struct file_operations { struct module *owner; loff_t (*llseek) (struct file *, loff_t, int);