Author: dchagin
Date: Sun May 24 18:08:01 2015
New Revision: 283492
URL: https://svnweb.freebsd.org/changeset/base/283492

Log:
  Implement Linux specific syncfs() system call.

Modified:
  head/sys/amd64/linux/linux_dummy.c
  head/sys/amd64/linux/syscalls.master
  head/sys/amd64/linux32/linux32_dummy.c
  head/sys/amd64/linux32/syscalls.master
  head/sys/compat/linux/linux_stats.c
  head/sys/i386/linux/linux_dummy.c
  head/sys/i386/linux/syscalls.master

Modified: head/sys/amd64/linux/linux_dummy.c
==============================================================================
--- head/sys/amd64/linux/linux_dummy.c  Sun May 24 18:06:46 2015        
(r283491)
+++ head/sys/amd64/linux/linux_dummy.c  Sun May 24 18:08:01 2015        
(r283492)
@@ -113,7 +113,6 @@ DUMMY(fanotify_mark);
 DUMMY(name_to_handle_at);
 DUMMY(open_by_handle_at);
 DUMMY(clock_adjtime);
-DUMMY(syncfs);
 DUMMY(setns);
 DUMMY(process_vm_readv);
 DUMMY(process_vm_writev);

Modified: head/sys/amd64/linux/syscalls.master
==============================================================================
--- head/sys/amd64/linux/syscalls.master        Sun May 24 18:06:46 2015        
(r283491)
+++ head/sys/amd64/linux/syscalls.master        Sun May 24 18:08:01 2015        
(r283492)
@@ -502,7 +502,7 @@
 303    AUE_NULL        STD     { int linux_name_to_handle_at(void); }
 304    AUE_NULL        STD     { int linux_open_by_handle_at(void); }
 305    AUE_NULL        STD     { int linux_clock_adjtime(void); }
-306    AUE_NULL        STD     { int linux_syncfs(void); }
+306    AUE_SYNC        STD     { int linux_syncfs(l_int fd); }
 307    AUE_NULL        STD     { int linux_sendmmsg(l_int s,                   
\
                                    struct l_mmsghdr *msg, l_uint vlen,         
\
                                    l_uint flags); }

Modified: head/sys/amd64/linux32/linux32_dummy.c
==============================================================================
--- head/sys/amd64/linux32/linux32_dummy.c      Sun May 24 18:06:46 2015        
(r283491)
+++ head/sys/amd64/linux32/linux32_dummy.c      Sun May 24 18:08:01 2015        
(r283492)
@@ -124,7 +124,6 @@ DUMMY(fanotify_mark);
 DUMMY(name_to_handle_at);
 DUMMY(open_by_handle_at);
 DUMMY(clock_adjtime);
-DUMMY(syncfs);
 DUMMY(setns);
 DUMMY(process_vm_readv);
 DUMMY(process_vm_writev);

Modified: head/sys/amd64/linux32/syscalls.master
==============================================================================
--- head/sys/amd64/linux32/syscalls.master      Sun May 24 18:06:46 2015        
(r283491)
+++ head/sys/amd64/linux32/syscalls.master      Sun May 24 18:08:01 2015        
(r283492)
@@ -573,7 +573,7 @@
 341    AUE_NULL        STD     { int linux_name_to_handle_at(void); }
 342    AUE_NULL        STD     { int linux_open_by_handle_at(void); }
 343    AUE_NULL        STD     { int linux_clock_adjtime(void); }
-344    AUE_NULL        STD     { int linux_syncfs(void); }
+344    AUE_SYNC        STD     { int linux_syncfs(l_int fd); }
 345    AUE_NULL        STD     { int linux_sendmmsg(l_int s,                   
\
                                    struct l_mmsghdr *msg, l_uint vlen,         
\
                                    l_uint flags); }

Modified: head/sys/compat/linux/linux_stats.c
==============================================================================
--- head/sys/compat/linux/linux_stats.c Sun May 24 18:06:46 2015        
(r283491)
+++ head/sys/compat/linux/linux_stats.c Sun May 24 18:08:01 2015        
(r283492)
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_compat.h"
 
 #include <sys/param.h>
+#include <sys/capsicum.h>
 #include <sys/dirent.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
@@ -653,3 +654,43 @@ linux_newfstatat(struct thread *td, stru
 }
 
 #endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */
+
+int
+linux_syncfs(struct thread *td, struct linux_syncfs_args *args)
+{
+       cap_rights_t rights;
+       struct mount *mp;
+       struct vnode *vp;
+       int error, save;
+
+       error = fgetvp(td, args->fd, cap_rights_init(&rights, CAP_FSYNC), &vp);
+       if (error != 0)
+               /*
+                * Linux syncfs() returns only EBADF, however fgetvp()
+                * can return EINVAL in case of file descriptor does
+                * not represent a vnode. XXX.
+                */
+               return (error);
+
+       mp = vp->v_mount;
+       mtx_lock(&mountlist_mtx);
+       error = vfs_busy(mp, MBF_MNTLSTLOCK);
+       if (error != 0) {
+               /* See comment above. */
+               mtx_unlock(&mountlist_mtx);
+               goto out;
+       }
+       if ((mp->mnt_flag & MNT_RDONLY) == 0 &&
+           vn_start_write(NULL, &mp, V_NOWAIT) == 0) {
+               save = curthread_pflags_set(TDP_SYNCIO);
+               vfs_msync(mp, MNT_NOWAIT);
+               VFS_SYNC(mp, MNT_NOWAIT);
+               curthread_pflags_restore(save);
+               vn_finished_write(mp);
+       }
+       vfs_unbusy(mp);
+
+ out:
+       vrele(vp);
+       return (error);
+}

Modified: head/sys/i386/linux/linux_dummy.c
==============================================================================
--- head/sys/i386/linux/linux_dummy.c   Sun May 24 18:06:46 2015        
(r283491)
+++ head/sys/i386/linux/linux_dummy.c   Sun May 24 18:08:01 2015        
(r283492)
@@ -120,7 +120,6 @@ DUMMY(fanotify_mark);
 DUMMY(name_to_handle_at);
 DUMMY(open_by_handle_at);
 DUMMY(clock_adjtime);
-DUMMY(syncfs);
 DUMMY(setns);
 DUMMY(process_vm_readv);
 DUMMY(process_vm_writev);

Modified: head/sys/i386/linux/syscalls.master
==============================================================================
--- head/sys/i386/linux/syscalls.master Sun May 24 18:06:46 2015        
(r283491)
+++ head/sys/i386/linux/syscalls.master Sun May 24 18:08:01 2015        
(r283492)
@@ -581,7 +581,7 @@
 341    AUE_NULL        STD     { int linux_name_to_handle_at(void); }
 342    AUE_NULL        STD     { int linux_open_by_handle_at(void); }
 343    AUE_NULL        STD     { int linux_clock_adjtime(void); }
-344    AUE_NULL        STD     { int linux_syncfs(void); }
+344    AUE_SYNC        STD     { int linux_syncfs(l_int fd); }
 345    AUE_NULL        STD     { int linux_sendmmsg(l_int s,                   
\
                                    struct l_mmsghdr *msg, l_uint vlen,         
\
                                    l_uint flags); }
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to