[PATCH] Create fs/utimes.c

* fs/open.c is getting bit crowdy
* preparation to lutimes(2)

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/Makefile b/fs/Makefile
index a503e6ce0f329944fd658e1e049662ab8d27f3cb..819b2a93bebe55cb4cc137514872892f90fa83da 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -10,7 +10,7 @@ obj-y :=      open.o read_write.o file_table.o super.o \
                ioctl.o readdir.o select.o fifo.o locks.o dcache.o inode.o \
                attr.o bad_inode.o file.o filesystems.o namespace.o aio.o \
                seq_file.o xattr.o libfs.o fs-writeback.o \
-               pnode.o drop_caches.o splice.o sync.o
+               pnode.o drop_caches.o splice.o sync.o utimes.o
 
 ifeq ($(CONFIG_BLOCK),y)
 obj-y +=       buffer.o bio.o block_dev.o direct-io.o mpage.o ioprio.o

diff --git a/fs/open.c b/fs/open.c
index 304c1c7814cbacfec0695e8714c5557ea8ee0e9b..35c3e454458ea4e434db071fcd380eda574ce919 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -6,7 +6,6 @@
 
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/utime.h>
 #include <linux/file.h>
 #include <linux/smp_lock.h>
 #include <linux/quotaops.h>
@@ -29,8 +28,6 @@
 #include <linux/rcupdate.h>
 #include <linux/audit.h>
 
-#include <asm/unistd.h>
-
 int vfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
        int retval = -ENODEV;
@@ -353,137 +350,6 @@ asmlinkage long sys_ftruncate64(unsigned int fd, loff_t length)
 }
 #endif
 
-#ifdef __ARCH_WANT_SYS_UTIME
-
-/*
- * sys_utime() can be implemented in user-level using sys_utimes().
- * Is this for backwards compatibility?  If so, why not move it
- * into the appropriate arch directory (for those architectures that
- * need it).
- */
-
-/* If times==NULL, set access and modification to current time,
- * must be owner or have write permission.
- * Else, update from *times, must be owner or super user.
- */
-asmlinkage long sys_utime(char __user * filename, struct utimbuf __user * times)
-{
-       int error;
-       struct nameidata nd;
-       struct inode * inode;
-       struct iattr newattrs;
-
-       error = user_path_walk(filename, &nd);
-       if (error)
-               goto out;
-       inode = nd.dentry->d_inode;
-
-       error = -EROFS;
-       if (IS_RDONLY(inode))
-               goto dput_and_out;
-
-       /* Don't worry, the checks are done in inode_change_ok() */
-       newattrs.ia_valid = ATTR_CTIME | ATTR_MTIME | ATTR_ATIME;
-       if (times) {
-               error = -EPERM;
-               if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
-                       goto dput_and_out;
-
-               error = get_user(newattrs.ia_atime.tv_sec, &times->actime);
-               newattrs.ia_atime.tv_nsec = 0;
-               if (!error)
-                       error = get_user(newattrs.ia_mtime.tv_sec, &times->modtime);
-               newattrs.ia_mtime.tv_nsec = 0;
-               if (error)
-                       goto dput_and_out;
-
-               newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
-       } else {
-                error = -EACCES;
-                if (IS_IMMUTABLE(inode))
-                        goto dput_and_out;
-
-               if (current->fsuid != inode->i_uid &&
-                   (error = vfs_permission(&nd, MAY_WRITE)) != 0)
-                       goto dput_and_out;
-       }
-       mutex_lock(&inode->i_mutex);
-       error = notify_change(nd.dentry, &newattrs);
-       mutex_unlock(&inode->i_mutex);
-dput_and_out:
-       path_release(&nd);
-out:
-       return error;
-}
-
-#endif
-
-/* If times==NULL, set access and modification to current time,
- * must be owner or have write permission.
- * Else, update from *times, must be owner or super user.
- */
-long do_utimes(int dfd, char __user *filename, struct timeval *times)
-{
-       int error;
-       struct nameidata nd;
-       struct inode * inode;
-       struct iattr newattrs;
-
-       error = __user_walk_fd(dfd, filename, LOOKUP_FOLLOW, &nd);
-
-       if (error)
-               goto out;
-       inode = nd.dentry->d_inode;
-
-       error = -EROFS;
-       if (IS_RDONLY(inode))
-               goto dput_and_out;
-
-       /* Don't worry, the checks are done in inode_change_ok() */
-       newattrs.ia_valid = ATTR_CTIME | ATTR_MTIME | ATTR_ATIME;
-       if (times) {
-               error = -EPERM;
-                if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
-                        goto dput_and_out;
-
-               newattrs.ia_atime.tv_sec = times[0].tv_sec;
-               newattrs.ia_atime.tv_nsec = times[0].tv_usec * 1000;
-               newattrs.ia_mtime.tv_sec = times[1].tv_sec;
-               newattrs.ia_mtime.tv_nsec = times[1].tv_usec * 1000;
-               newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
-       } else {
-               error = -EACCES;
-                if (IS_IMMUTABLE(inode))
-                        goto dput_and_out;
-
-               if (current->fsuid != inode->i_uid &&
-                   (error = vfs_permission(&nd, MAY_WRITE)) != 0)
-                       goto dput_and_out;
-       }
-       mutex_lock(&inode->i_mutex);
-       error = notify_change(nd.dentry, &newattrs);
-       mutex_unlock(&inode->i_mutex);
-dput_and_out:
-       path_release(&nd);
-out:
-       return error;
-}
-
-asmlinkage long sys_futimesat(int dfd, char __user *filename, struct timeval __user *utimes)
-{
-       struct timeval times[2];
-
-       if (utimes && copy_from_user(&times, utimes, sizeof(times)))
-               return -EFAULT;
-       return do_utimes(dfd, filename, utimes ? times : NULL);
-}
-
-asmlinkage long sys_utimes(char __user *filename, struct timeval __user *utimes)
-{
-       return sys_futimesat(AT_FDCWD, filename, utimes);
-}
-
-
 /*
  * access() needs to use the real uid/gid, not the effective uid/gid.
  * We do this by temporarily clearing all FS-related capabilities and

diff --git a/fs/utimes.c b/fs/utimes.c
new file mode 100644 (file)
index 0000000..1bcd852
--- /dev/null
+++ b/fs/utimes.c
@@ -0,0 +1,137 @@
+#include <linux/compiler.h>
+#include <linux/fs.h>
+#include <linux/linkage.h>
+#include <linux/namei.h>
+#include <linux/utime.h>
+#include <asm/uaccess.h>
+#include <asm/unistd.h>
+
+#ifdef __ARCH_WANT_SYS_UTIME
+
+/*
+ * sys_utime() can be implemented in user-level using sys_utimes().
+ * Is this for backwards compatibility?  If so, why not move it
+ * into the appropriate arch directory (for those architectures that
+ * need it).
+ */
+
+/* If times==NULL, set access and modification to current time,
+ * must be owner or have write permission.
+ * Else, update from *times, must be owner or super user.
+ */
+asmlinkage long sys_utime(char __user * filename, struct utimbuf __user * times)
+{
+       int error;
+       struct nameidata nd;
+       struct inode * inode;
+       struct iattr newattrs;
+
+       error = user_path_walk(filename, &nd);
+       if (error)
+               goto out;
+       inode = nd.dentry->d_inode;
+
+       error = -EROFS;
+       if (IS_RDONLY(inode))
+               goto dput_and_out;
+
+       /* Don't worry, the checks are done in inode_change_ok() */
+       newattrs.ia_valid = ATTR_CTIME | ATTR_MTIME | ATTR_ATIME;
+       if (times) {
+               error = -EPERM;
+               if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
+                       goto dput_and_out;
+
+               error = get_user(newattrs.ia_atime.tv_sec, &times->actime);
+               newattrs.ia_atime.tv_nsec = 0;
+               if (!error)
+                       error = get_user(newattrs.ia_mtime.tv_sec, &times->modtime);
+               newattrs.ia_mtime.tv_nsec = 0;
+               if (error)
+                       goto dput_and_out;
+
+               newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
+       } else {
+                error = -EACCES;
+                if (IS_IMMUTABLE(inode))
+                        goto dput_and_out;
+
+               if (current->fsuid != inode->i_uid &&
+                   (error = vfs_permission(&nd, MAY_WRITE)) != 0)
+                       goto dput_and_out;
+       }
+       mutex_lock(&inode->i_mutex);
+       error = notify_change(nd.dentry, &newattrs);
+       mutex_unlock(&inode->i_mutex);
+dput_and_out:
+       path_release(&nd);
+out:
+       return error;
+}
+
+#endif
+
+/* If times==NULL, set access and modification to current time,
+ * must be owner or have write permission.
+ * Else, update from *times, must be owner or super user.
+ */
+long do_utimes(int dfd, char __user *filename, struct timeval *times)
+{
+       int error;
+       struct nameidata nd;
+       struct inode * inode;
+       struct iattr newattrs;
+
+       error = __user_walk_fd(dfd, filename, LOOKUP_FOLLOW, &nd);
+
+       if (error)
+               goto out;
+       inode = nd.dentry->d_inode;
+
+       error = -EROFS;
+       if (IS_RDONLY(inode))
+               goto dput_and_out;
+
+       /* Don't worry, the checks are done in inode_change_ok() */
+       newattrs.ia_valid = ATTR_CTIME | ATTR_MTIME | ATTR_ATIME;
+       if (times) {
+               error = -EPERM;
+                if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
+                        goto dput_and_out;
+
+               newattrs.ia_atime.tv_sec = times[0].tv_sec;
+               newattrs.ia_atime.tv_nsec = times[0].tv_usec * 1000;
+               newattrs.ia_mtime.tv_sec = times[1].tv_sec;
+               newattrs.ia_mtime.tv_nsec = times[1].tv_usec * 1000;
+               newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
+       } else {
+               error = -EACCES;
+                if (IS_IMMUTABLE(inode))
+                        goto dput_and_out;
+
+               if (current->fsuid != inode->i_uid &&
+                   (error = vfs_permission(&nd, MAY_WRITE)) != 0)
+                       goto dput_and_out;
+       }
+       mutex_lock(&inode->i_mutex);
+       error = notify_change(nd.dentry, &newattrs);
+       mutex_unlock(&inode->i_mutex);
+dput_and_out:
+       path_release(&nd);
+out:
+       return error;
+}
+
+asmlinkage long sys_futimesat(int dfd, char __user *filename, struct timeval __user *utimes)
+{
+       struct timeval times[2];
+
+       if (utimes && copy_from_user(&times, utimes, sizeof(times)))
+               return -EFAULT;
+       return do_utimes(dfd, filename, utimes ? times : NULL);
+}
+
+asmlinkage long sys_utimes(char __user *filename, struct timeval __user *utimes)
+{
+       return sys_futimesat(AT_FDCWD, filename, utimes);
+}

diff --git a/include/linux/namei.h b/include/linux/namei.h
index c6470ba006680a3d97191f7baf62c73bd3b0c96b..f5f19606effbd0c84f74007aaf25c145e76d9eef 100644 (file)
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_NAMEI_H
 #define _LINUX_NAMEI_H
 
+#include <linux/dcache.h>
 #include <linux/linkage.h>
 
 struct vfsmount;

diff --git a/include/linux/utime.h b/include/linux/utime.h
index c6bf27b7897e79e279446fb2ef9aa887f4b34488..640be6a1959e8074ad79bce56ef71ecbeb779053 100644 (file)
--- a/include/linux/utime.h
+++ b/include/linux/utime.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_UTIME_H
 #define _LINUX_UTIME_H
 
+#include <linux/types.h>
+
 struct utimbuf {
        time_t actime;
        time_t modtime;